X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff.sh;h=0fe677074959de444a6c5a273ea816439c6421e0;hb=23edecbc9a5566ac5aa8fb251fbcf8bb83694837;hp=9732c8ac3110e9beb65221c7528812a4655eab13;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/git-diff.sh b/git-diff.sh
index 9732c8ac..0fe67707 100755
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -3,32 +3,71 @@
 # Copyright (c) 2005 Linus Torvalds
 # Copyright (c) 2005 Junio C Hamano
 
+USAGE='[ --diff-options ] <ent>{0,2} [<path>...]'
+SUBDIRECTORY_OK='Yes'
+. git-sh-setup
+
 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'"}
+# I often say 'git diff --cached -p' and get scolded by git-diff-files, but
+# obviously I mean 'git diff --cached -p HEAD' in that case.
+case "$rev" in
+'')
+	case " $flags " in
+	*" '--cached' "*)
+		rev='HEAD '
+		;;
+	esac
+esac
+
+# If we have -[123] --ours --theirs --base, don't do --cc by default.
+case " $flags " in
+*" '-"[123]"' "* | *" '--ours' "* | *" '--base' "* | *" '--theirs' "*)
+	cc_or_p=-p ;;
+*)
+	cc_or_p=--cc ;;
+esac
+
+# If we do not have --name-status, --name-only, -r, -c or --stat,
+# default to --cc.
+case " $flags " in
+*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* | *" '-c' "* | \
+*" '--stat' "*)
+	;;
+*)
+	flags="$flags'$cc_or_p' " ;;
+esac
+
+# If we do not have -B, -C, -r, nor -p, default to -M.
+case " $flags " in
+*" '-"[BCMrp]* | *" '--find-copies-harder' "*)
+	;; # something like -M50.
+*)
+	flags="$flags'-M' " ;;
+esac
 
 case "$rev" in
 ?*' '?*' '?*)
-	die "I don't understand"
+	usage
 	;;
 ?*' '^?*)
 	begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') &&
 	end=$(expr "$rev" : '.\([0-9a-f]*\). .*') || exit
-	cmd="git-diff-tree $flags $begin $end $files"
+	cmd="git-diff-tree $flags $begin $end -- $files"
 	;;
 ?*' '?*)
-	cmd="git-diff-tree $flags $rev $files"
+	cmd="git-diff-tree $flags $rev -- $files"
 	;;
 ?*' ')
-	cmd="git-diff-index $flags $rev $files"
+	cmd="git-diff-index $flags $rev -- $files"
 	;;
 '')
-	cmd="git-diff-files $flags $files"
+	cmd="git-diff-files $flags -- $files"
 	;;
 *)
-	die "I don't understand $*"
+	usage
 	;;
 esac