Fix git-pack-objects for 64-bit platforms

[git.git] / git-diff.sh

diff --git a/git-diff.sh b/git-diff.sh
index 4812ae4..0fe6770 100755 (executable)
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -22,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
-*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* )
+*" '-"[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'-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' " ;;