[PATCH] Make sure git-resolve-script always works on commits

diff --git a/git-resolve-script b/git-resolve-script
index 52dd83bae0d6ca95cc083cd6df06a289c51558a5..4641119e0f00848f5dacce40fd376efc1cbdbcb5 100755 (executable)
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -6,8 +6,8 @@
 #
 . git-sh-setup-script || die "Not a git archive"
 
-head=$(git-rev-parse --verify "$1")
-merge=$(git-rev-parse --verify "$2")
+head=$(git-rev-parse --verify "$1"^0) || exit
+merge=$(git-rev-parse --verify "$2"^0) || exit
 merge_msg="$3"
 
 dropheads() {