[PATCH] git-branch: avoid getting confused by empty or nonexisting branches.

diff --git a/git-diff-script b/git-diff-script
index 673853b9ce3a5200c0085f33d1e41f12cf18eb0c..03ed555e777b6dfeac8811338986eb752418ab72 100755 (executable)
--- a/git-diff-script
+++ b/git-diff-script
@@ -1,6 +1,9 @@
 #!/bin/sh
+. git-sh-setup-script || die "Not a git archive"
+
 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 +12,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;;