X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=inline;f=git-diff.sh;h=b62e58341cd9d11fc893613949426126871531e2;hb=56b5e946f2ba4fd57bbe14f9e3ec2e0ae314d5e6;hp=e45f50ec224d2b0ee23780a00dd351746665a9a2;hpb=d165fa14f0a111dfc85d964ecc037d0b280cd54f;p=git.git

diff --git a/git-diff.sh b/git-diff.sh
index e45f50ec..b62e5834 100755
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -7,8 +7,6 @@ rev=$(git-rev-parse --revs-only --no-flags --sq "$@") || exit
 flags=$(git-rev-parse --no-revs --flags --sq "$@")
 files=$(git-rev-parse --no-revs --no-flags --sq "$@")
 
-: ${flags:="'-M' '-p'"}
-
 die () {
     echo >&2 "$*"
     exit 1
@@ -25,6 +23,21 @@ case "$rev" in
 	esac
 esac
 
+# If we do not have --name-status, --name-only nor -r, default to -p.
+# If we do not have -B nor -C, default to -M.
+case " $flags " in
+*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* )
+	;;
+*)
+	flags="$flags'-p' " ;;
+esac
+case " $flags " in
+*" '-"[BCM]* | *" '--find-copies-harder' "*)
+	;; # something like -M50.
+*)
+	flags="$flags'-M' " ;;
+esac
+
 case "$rev" in
 ?*' '?*' '?*)
 	echo >&2 "I don't understand"