X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-diff-script;h=020816bbf0581ec562f11d92a8b4f8bacb40cca6;hb=a87e8be2aece466e3f41dfde81c80709e1d56cd3;hp=ae1587121bcbf76be2ffc655580b4f24319f49cf;hpb=40d8cfe4117564e5520e8f4f953addaa94844476;p=git.git diff --git a/git-diff-script b/git-diff-script index ae158712..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 -C "$@";; + git-diff-files -M -p "$@";; 1) - git-diff-cache -p -C "$@";; + git-diff-cache -M -p "$@";; 2) begin=$(echo "${rev[1]}" | tr -d '^') end="${rev[0]}" - git-diff-tree -p -C $flags $begin $end;; + git-diff-tree -M -p $flags $begin $end $files;; *) echo "I don't understand" exit 1;;