X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-resolve-script;h=4641119e0f00848f5dacce40fd376efc1cbdbcb5;hb=35cc4bcd10862db190df9685b7ad221f2a25404f;hp=fffcb07df3d020592c79de189ea2d762b0df7232;hpb=07ee0d77c66d6f356cd3f82435e67510779aa53c;p=git.git

diff --git a/git-resolve-script b/git-resolve-script
index fffcb07d..4641119e 100755
--- 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 --revs-only "$1")
-merge=$(git-rev-parse --revs-only "$2")
+head=$(git-rev-parse --verify "$1"^0) || exit
+merge=$(git-rev-parse --verify "$2"^0) || exit
 merge_msg="$3"
 
 dropheads() {