X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-format-patch.sh;h=9378219d846dcbd947ab63bd6d728aaac24e8ea3;hb=7ee74a99b2b710b5f5adc22db2fe0aca8a74c809;hp=525a2f22126cfead751c30310ffe2b2fd971fdae;hpb=3db6b224cf36748b969acdd96b9fb2de641cd641;p=git.git

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 525a2f22..9378219d 100755
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -128,10 +128,6 @@ whosepatchScript='
 	q
 }'
 
-_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
-_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
-stripCommitHead='/^'"$_x40"' (from '"$_x40"')$/d'
-
 git-cherry -v "$rev1" "$rev2" |
 while read sign rev comment
 do
@@ -216,7 +212,10 @@ Date: '"$ad"
 	echo
 	git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
 	echo
-	git-diff-tree -p $diff_opts "$commit" | sed -e "$stripCommitHead"
+	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)