X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff-script;h=020816bbf0581ec562f11d92a8b4f8bacb40cca6;hb=acb46f8769dd0031a98a284e06ebc5a09b151bfd;hp=d70e8b9f2961fb5cbe53d473af8f2c1c8c1024d4;hpb=aeac6681250440bc9801d6d6cc293cc708895b46;p=git.git diff --git a/git-diff-script b/git-diff-script index d70e8b9f..020816bb 100755 --- a/git-diff-script +++ b/git-diff-script @@ -1,15 +1,16 @@ #!/bin/sh rev=($(git-rev-parse --revs-only "$@")) -flags=($(git-rev-parse --no-revs "$@")) +flags=($(git-rev-parse --no-revs --flags "$@")) +files=($(git-rev-parse --no-revs --no-flags "$@")) case "${#rev[*]}" in 0) - git-diff-files -p "$@";; + git-diff-files -M -p "$@";; 1) - git-diff-cache -p "$@";; + git-diff-cache -M -p "$@";; 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 $files;; *) echo "I don't understand" exit 1;;