X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff.sh;h=0fe677074959de444a6c5a273ea816439c6421e0;hb=c1aee1fd8d94da9b3c5d2dc1d4264f7e73a58f80;hp=7baf7044e440e6d052f5e92e1008f710dd319c67;hpb=562051809589574576971c53c23aad93f8c395d9;p=git.git

diff --git a/git-diff.sh b/git-diff.sh
index 7baf7044..0fe67707 100755
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -3,6 +3,10 @@
 # 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 "$@")
@@ -18,16 +22,27 @@ 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.
+# 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' "* )
+*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* | *" '-c' "* | \
+*" '--stat' "*)
 	;;
 *)
-	flags="$flags'-p' " ;;
+	flags="$flags'$cc_or_p' " ;;
 esac
+
+# If we do not have -B, -C, -r, nor -p, default to -M.
 case " $flags " in
-*" '-"[BCM]* | *" '--find-copies-harder' "*)
+*" '-"[BCMrp]* | *" '--find-copies-harder' "*)
 	;; # something like -M50.
 *)
 	flags="$flags'-M' " ;;
@@ -35,8 +50,7 @@ esac
 
 case "$rev" in
 ?*' '?*' '?*)
-	echo >&2 "I don't understand"
-	exit 1
+	usage
 	;;
 ?*' '^?*)
 	begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') &&
@@ -53,7 +67,7 @@ case "$rev" in
 	cmd="git-diff-files $flags -- $files"
 	;;
 *)
-	die "I don't understand $*"
+	usage
 	;;
 esac