Use "-M" instead of "-C" for "git diff" and "git status"

The "C" in "-C" may stand for "Cool", but it's also pretty slow, since
right now it leaves all unmodified files to be tested even if there are
no new files at all.  That just ends up being unacceptably slow for big
projects, especially if it's not all in the cache.

diff --git a/git-diff-script b/git-diff-script
index d70e8b9f2961fb5cbe53d473af8f2c1c8c1024d4..673853b9ce3a5200c0085f33d1e41f12cf18eb0c 100755 (executable)
--- a/git-diff-script
+++ b/git-diff-script
@@ -3,13 +3,13 @@ rev=($(git-rev-parse --revs-only "$@"))
 flags=($(git-rev-parse --no-revs "$@"))
 case "${#rev[*]}" in
 0)
 flags=($(git-rev-parse --no-revs "$@"))
 case "${#rev[*]}" in
 0)

-       git-diff-files -p "$@";;
+       git-diff-files -M -p "$@";;

 1)
 1)

-       git-diff-cache -p "$@";;
+       git-diff-cache -M -p "$@";;

 2)
        begin=$(echo "${rev[1]}" | tr -d '^')
        end="${rev[0]}"
 2)
        begin=$(echo "${rev[1]}" | tr -d '^')
        end="${rev[0]}"

-       git-diff-tree -p $flags $begin $end;;
+       git-diff-tree -M -p $flags $begin $end;;

 *)
        echo "I don't understand"
        exit 1;;
 *)
        echo "I don't understand"
        exit 1;;

diff --git a/git-status-script b/git-status-script
index f91bb55894a07f3ebca9031f2fa2ba2ef8789ffd..7d47fdea79aafaab1d6357d8ce478e2fb40b45b0 100755 (executable)
--- a/git-status-script
+++ b/git-status-script
@@ -27,7 +27,7 @@ report () {
 }
 
 git-update-cache --refresh >& /dev/null
 }
 
 git-update-cache --refresh >& /dev/null

-git-diff-cache -B -C --cached HEAD | sed 's/^://' | report "Updated but not checked in" "will commit"
+git-diff-cache -M --cached HEAD | sed 's/^://' | report "Updated but not checked in" "will commit"

 committable="$?"
 git-diff-files | sed 's/^://' | report "Changed but not updated" "use git-update-cache to mark for commit"
 if [ "$committable" == "0" ]
 committable="$?"
 git-diff-files | sed 's/^://' | report "Changed but not updated" "use git-update-cache to mark for commit"
 if [ "$committable" == "0" ]