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>
Sean committed
May 14, 2006 at 08:16 UTC
9d76812b42009069aa3ff8f29e51b5150aa04e8e
3 files changed
+3
-4
git-format-patch.sh
+1
-1
@@ -274,7 +274,7 @@ print "\n---\n\n";
274
close FH or die "close $commsg pipe";
275
' "$keep_subject" "$num" "$signoff" "$headers" "$mimemagic" $commsg
276
277
- git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
277
+ git-diff-tree -p --stat --summary $diff_opts "$commit"
278
echo
279
case "$mimemagic" in
280
'');;
git-merge.sh
+1
-2
@@ -55,8 +55,7 @@ finish () {
55
56
case "$no_summary" in
57
'')
58
- git-diff-tree -p -M "$head" "$1" |
59
- git-apply --stat --summary
58
+ git-diff-tree -p --stat --summary -M "$head" "$1"
59
;;
60
esac
61
}
git-request-pull.sh
+1
-1
@@ -30,4 +30,4 @@ echo " $url"
30
echo
31
32
git log $baserev..$headrev | git-shortlog ;
33
-git diff $baserev..$headrev | git-apply --stat --summary
33
+git diff --stat --summary $baserev..$headrev