merge: use return value of resolve_ref() to determine if HEAD is invalid

[git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index a068660d0989a803a871aa6d820e0cc347bbf586..c371484ab6b779d183534a04a57cdb3c190fc9a9 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1030,7 +1030,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
        branch = resolve_ref("HEAD", head, 0, &flag);
        if (branch && !prefixcmp(branch, "refs/heads/"))
                branch += 11;
-       if (is_null_sha1(head))
+       if (!branch || is_null_sha1(head))
                head_invalid = 1;
 
        git_config(git_merge_config, NULL);