undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include ../README in git.txt - make a local copy

Browse Source 
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>
This commit is contained in:
Pavel Roskin 2006-01-25 01:52:22 -05:00 committed by Junio C Hamano
parent 41e79c9559
commit 941c944999
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/.gitignore vendored
View File

@ -4,3 +4,4 @@
*.7 *.7
howto-index.txt howto-index.txt
doc.dep doc.dep
README

9
Documentation/Makefile
View File

@ -62,11 +62,14 @@ doc.dep : $(wildcard *.txt) build-docdep.perl
-include doc.dep -include doc.dep
git.7: ../README git.7: README
README: ../README
cp $< $@
clean: clean:
rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep README
%.html : %.txt %.html : %.txt
asciidoc -b xhtml11 -d manpage -f asciidoc.conf $< asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
@ -77,7 +80,7 @@ clean:
%.xml : %.txt %.xml : %.txt
asciidoc -b docbook -d manpage -f asciidoc.conf $< asciidoc -b docbook -d manpage -f asciidoc.conf $<
git.html: git.txt ../README git.html: git.txt README
glossary.html : glossary.txt sort_glossary.pl glossary.html : glossary.txt sort_glossary.pl
cat $< | \ cat $< | \

2
Documentation/git.txt
View File

@ -586,7 +586,7 @@ git Diffs
Discussion[[Discussion]] Discussion[[Discussion]]
------------------------ ------------------------
include::../README[] include::README[]
Authors Authors
------- -------