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>

diff --git a/Makefile b/Makefile
index 0d3c27793e1e235255229c3408b2675632810afd..fd4e163bade6e2bb7f671f4b3ee710f1e0badad4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -306,19 +306,24 @@ git: git.sh Makefile
 
 $(filter-out git,$(patsubst %.sh,%,$(SCRIPT_SH))) : % : %.sh
        rm -f $@
 
 $(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 $@
        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' \
        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
        chmod +x $@
 
 %.o: %.c

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 2844799535a4c63f61f6c94cf7a66c88d0052656..9378219d846dcbd947ab63bd6d728aaac24e8ea3 100755 (executable)
--- 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
        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"
        git-diff-tree -p $diff_opts "$commit"

+       echo "---"
+       echo "@@GIT_VERSION@@"

 
        case "$mbox" in
        t)
 
        case "$mbox" in
        t)