Skip to content

Commit 941c944

Browse files
Pavel RoskinJunio C Hamano
authored andcommitted
Don't include ../README in git.txt - make a local copy
asciidoc 7.0.4 and newer considers such includes from parent directory unsafe. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 41e79c9 commit 941c944

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Documentation/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
*.7
55
howto-index.txt
66
doc.dep
7+
README

Documentation/Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,14 @@ doc.dep : $(wildcard *.txt) build-docdep.perl
6262

6363
-include doc.dep
6464

65-
git.7: ../README
65+
git.7: README
66+
67+
README: ../README
68+
cp $< $@
6669

6770

6871
clean:
69-
rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep
72+
rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep README
7073

7174
%.html : %.txt
7275
asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
@@ -77,7 +80,7 @@ clean:
7780
%.xml : %.txt
7881
asciidoc -b docbook -d manpage -f asciidoc.conf $<
7982

80-
git.html: git.txt ../README
83+
git.html: git.txt README
8184

8285
glossary.html : glossary.txt sort_glossary.pl
8386
cat $< | \

Documentation/git.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ git Diffs
586586

587587
Discussion[[Discussion]]
588588
------------------------
589-
include::../README[]
589+
include::README[]
590590

591591
Authors
592592
-------

0 commit comments

Comments
 (0)