server-info.c: and two functions are not used anymore.

diff --git a/git-diff.sh b/git-diff.sh
index 84a152af206166e88701b27acdc7d2b033e90bab..b62e58341cd9d11fc893613949426126871531e2 100755 (executable)
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -7,7 +7,10 @@ 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
+}
 
 # 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.
@@ -20,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"
@@ -28,16 +46,16 @@ case "$rev" in
 ?*' '^?*)
        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 $*"