Browse Source

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>
maint
Sean 19 years ago committed by Junio C Hamano
parent
commit
9d76812b42
  1. 2
      git-format-patch.sh
  2. 3
      git-merge.sh
  3. 2
      git-request-pull.sh

2
git-format-patch.sh

@ -274,7 +274,7 @@ print "\n---\n\n"; @@ -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
'');;

3
git-merge.sh

@ -55,8 +55,7 @@ finish () { @@ -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
}

2
git-request-pull.sh

@ -30,4 +30,4 @@ echo " $url" @@ -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

Loading…
Cancel
Save