[PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)
[git/dscho.git] / git-diff-script
blob020816bbf0581ec562f11d92a8b4f8bacb40cca6
1 #!/bin/sh
2 rev=($(git-rev-parse --revs-only "$@"))
3 flags=($(git-rev-parse --no-revs --flags "$@"))
4 files=($(git-rev-parse --no-revs --no-flags "$@"))
5 case "${#rev[*]}" in
6 0)
7 git-diff-files -M -p "$@";;
8 1)
9 git-diff-cache -M -p "$@";;
11 begin=$(echo "${rev[1]}" | tr -d '^')
12 end="${rev[0]}"
13 git-diff-tree -M -p $flags $begin $end $files;;
15 echo "I don't understand"
16 exit 1;;
17 esac