X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-resolve-script;h=52dd83bae0d6ca95cc083cd6df06a289c51558a5;hb=71fb3de0eed70bba1c7e28c8a0a2968efc48b9f3;hp=fffcb07df3d020592c79de189ea2d762b0df7232;hpb=07ee0d77c66d6f356cd3f82435e67510779aa53c;p=git.git

diff --git a/git-resolve-script b/git-resolve-script
index fffcb07d..52dd83ba 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")
+merge=$(git-rev-parse --verify "$2")
 merge_msg="$3"
 
 dropheads() {