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

Merge branch 'maint'

Browse Source 
* maint:
  filter-branch: Export variable `workdir' for --commit-filter
  Documentation/Makefile: add *.pdf to `clean' target
  Documentation: ignore *.pdf files
This commit is contained in:
Junio C Hamano 2011-08-08 12:24:16 -07:00
commit fca64c80fb
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/.gitignore vendored
View File

@ -3,6 +3,7 @@
*.[1-8] *.[1-8]
*.made *.made
*.texi *.texi
*.pdf
git.info git.info
gitman.info gitman.info
howto-index.txt howto-index.txt

1
Documentation/Makefile
View File

@ -232,6 +232,7 @@ cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT)
clean: clean:
$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7 $(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
$(RM) *.texi *.texi+ *.texi++ git.info gitman.info $(RM) *.texi *.texi+ *.texi++ git.info gitman.info
$(RM) *.pdf
$(RM) howto-index.txt howto/*.html doc.dep $(RM) howto-index.txt howto/*.html doc.dep
$(RM) technical/api-*.html technical/api-index.txt $(RM) technical/api-*.html technical/api-index.txt
$(RM) $(cmds_txt) *.made $(RM) $(cmds_txt) *.made

2
git-filter-branch.sh
View File

@ -363,7 +363,7 @@ while read commit parents; do
sed -e '1,/^$/d' <../commit | \ sed -e '1,/^$/d' <../commit | \
eval "$filter_msg" > ../message || eval "$filter_msg" > ../message ||
die "msg filter failed: $filter_msg" die "msg filter failed: $filter_msg"
@SHELL_PATH@ -c "$filter_commit" "git commit-tree" \ workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
$(git write-tree) $parentstr < ../message > ../map/$commit || $(git write-tree) $parentstr < ../message > ../map/$commit ||
die "could not write rewritten commit" die "could not write rewritten commit"
done <../revs done <../revs