mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
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 <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b4fd94064d
commit
10b98fa5b3
1 changed files with 1 additions and 1 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue