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 c077f44ca1637008b5c16c3d48294a2d268edc9e..8a16eadfbd391c957c5e297a3511bbfe4c5ef89d 100755 (executable)
--- 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
 
 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
        '');;
        echo
        case "$mimemagic" in
        '');;

diff --git a/git-merge.sh b/git-merge.sh
index b834e79c98af51a9f3ad4927a2d11c999349b0e4..af1f25b3c51d197ea5fd24b7623dfb591f867133 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -55,8 +55,7 @@ finish () {
 
        case "$no_summary" in
        '')
 
        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
 }
                ;;
        esac
 }

diff --git a/git-request-pull.sh b/git-request-pull.sh
index 2c48bfb299325ba7a27e883b6a4815ebde09ae58..4319e35c628efdd86745c560d2dfe306b180fb1b 100755 (executable)
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -30,4 +30,4 @@ echo "  $url"
 echo
 
 git log  $baserev..$headrev | git-shortlog ;
 echo
 
 git log  $baserev..$headrev | git-shortlog ;

-git diff $baserev..$headrev | git-apply --stat --summary
+git diff --stat --summary $baserev..$headrev