diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-10-04 12:41:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-04 17:04:45 -0700 |
| commit | 3ff8cbeda635422f4740d325d56288dfdea10179 (patch) | |
| tree | 9eec9ff9326032bca405a12a265918725edf4ac7 | |
| parent | git-applypatch: cleanup. (diff) | |
| download | tgif-3ff8cbeda635422f4740d325d56288dfdea10179.tar.xz | |
Record which tree the patch applies to.
Also note which version of GIT produced the patch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Makefile | 11 | ||||
| -rwxr-xr-x | git-format-patch.sh | 3 |
2 files changed, 11 insertions, 3 deletions
@@ -306,19 +306,24 @@ git: git.sh Makefile $(filter-out git,$(patsubst %.sh,%,$(SCRIPT_SH))) : % : %.sh rm -f $@ - sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' $@.sh >$@ + sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' \ + -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ + $@.sh >$@ chmod +x $@ $(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl rm -f $@ - sed -e '1s|#!.*perl|#!$(PERL_PATH)|' $@.perl >$@ + sed -e '1s|#!.*perl|#!$(PERL_PATH)|' \ + -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ + $@.perl >$@ chmod +x $@ $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py rm -f $@ sed -e '1s|#!.*python|#!$(PYTHON_PATH)|' \ -e 's|@@GIT_PYTHON_PATH@@|$(GIT_PYTHON_DIR)|g' \ - $@.py >$@ + -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ + $@.py >$@ chmod +x $@ %.o: %.c diff --git a/git-format-patch.sh b/git-format-patch.sh index 2844799535..9378219d84 100755 --- a/git-format-patch.sh +++ b/git-format-patch.sh @@ -212,7 +212,10 @@ Date: '"$ad" echo git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary echo + git-cat-file commit "$commit^" | sed -e 's/^tree /applies-to: /' -e q git-diff-tree -p $diff_opts "$commit" + echo "---" + echo "@@GIT_VERSION@@" case "$mbox" in t) |