X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff-script;h=020816bbf0581ec562f11d92a8b4f8bacb40cca6;hb=d6d8dac032e0e0c55b3edffbefd0abb00ca960fc;hp=673853b9ce3a5200c0085f33d1e41f12cf18eb0c;hpb=b43d44779bf98977b211256f936d0edda8a9625a;p=git.git diff --git a/git-diff-script b/git-diff-script index 673853b9..020816bb 100755 --- a/git-diff-script +++ b/git-diff-script @@ -1,6 +1,7 @@ #!/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 -M -p "$@";; @@ -9,7 +10,7 @@ case "${#rev[*]}" in 2) begin=$(echo "${rev[1]}" | tr -d '^') end="${rev[0]}" - git-diff-tree -M -p $flags $begin $end;; + git-diff-tree -M -p $flags $begin $end $files;; *) echo "I don't understand" exit 1;;