From: Sean <seanlkml@sympatico.ca>
Date: Sun, 14 May 2006 12:16:06 +0000 (-0400)
Subject: Convert some "apply --summary" users to "diff --summary".
X-Git-Tag: v1.4.1-rc1~111^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9d76812b42009069aa3ff8f29e51b5150aa04e8e;p=git.git

Convert some "apply --summary" users to "diff --summary".

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-format-patch.sh b/git-format-patch.sh
index c077f44ca..8a16eadfb 100755
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -274,7 +274,7 @@ print "\n---\n\n";
 close FH or die "close $commsg pipe";
 ' "$keep_subject" "$num" "$signoff" "$headers" "$mimemagic" $commsg
 
-	git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
+	git-diff-tree -p --stat --summary $diff_opts "$commit"
 	echo
 	case "$mimemagic" in
 	'');;
diff --git a/git-merge.sh b/git-merge.sh
index b834e79c9..af1f25b3c 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -55,8 +55,7 @@ finish () {
 
 	case "$no_summary" in
 	'')
-		git-diff-tree -p -M "$head" "$1" |
-		git-apply --stat --summary
+		git-diff-tree -p --stat --summary -M "$head" "$1"
 		;;
 	esac
 }
diff --git a/git-request-pull.sh b/git-request-pull.sh
index 2c48bfb29..4319e35c6 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -30,4 +30,4 @@ echo "  $url"
 echo
 
 git log  $baserev..$headrev | git-shortlog ;
-git diff $baserev..$headrev | git-apply --stat --summary
+git diff --stat --summary $baserev..$headrev