From: Nguyễn Thái Ngọc Duy Date: Sat, 17 Sep 2011 11:57:43 +0000 (+1000) Subject: merge: use return value of resolve_ref() to determine if HEAD is invalid X-Git-Tag: v1.7.7.1~3^2~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/10b98fa5b3fab4a4ba46f31b58f8da703b465b68 merge: use return value of resolve_ref() to determine if HEAD is invalid resolve_ref() only updates "head" when it returns non NULL value (it may update "head" even when returning NULL, but not in all cases). Because "head" is not initialized before the call, is_null_sha1() is not enough. Check also resolve_ref() return value. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/builtin/merge.c b/builtin/merge.c index a068660d09..c371484ab6 100644 --- 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);