From 9d76812b42009069aa3ff8f29e51b5150aa04e8e Mon Sep 17 00:00:00 2001 From: Sean Date: Sun, 14 May 2006 08:16:06 -0400 Subject: [PATCH] Convert some "apply --summary" users to "diff --summary". Signed-off-by: Sean Estabrooks Signed-off-by: Junio C Hamano --- git-format-patch.sh | 2 +- git-merge.sh | 3 +-- git-request-pull.sh | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/git-format-patch.sh b/git-format-patch.sh index c077f44c..8a16eadf 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 b834e79c..af1f25b3 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 2c48bfb2..4319e35c 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 -- 2.11.0