mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'nh/empty-rebase'
By Neil Horman * nh/empty-rebase: git cherry-pick: do not dereference a potential NULL pointer
This commit is contained in:
commit
5543501ced
14
sequencer.c
14
sequencer.c
|
@ -261,9 +261,17 @@ static int is_index_unchanged(void)
|
||||||
return error(_("Could not resolve HEAD commit\n"));
|
return error(_("Could not resolve HEAD commit\n"));
|
||||||
|
|
||||||
head_commit = lookup_commit(head_sha1);
|
head_commit = lookup_commit(head_sha1);
|
||||||
if (!head_commit || parse_commit(head_commit))
|
|
||||||
return error(_("could not parse commit %s\n"),
|
/*
|
||||||
sha1_to_hex(head_commit->object.sha1));
|
* If head_commit is NULL, check_commit, called from
|
||||||
|
* lookup_commit, would have indicated that head_commit is not
|
||||||
|
* a commit object already. parse_commit() will return failure
|
||||||
|
* without further complaints in such a case. Otherwise, if
|
||||||
|
* the commit is invalid, parse_commit() will complain. So
|
||||||
|
* there is nothing for us to say here. Just return failure.
|
||||||
|
*/
|
||||||
|
if (parse_commit(head_commit))
|
||||||
|
return -1;
|
||||||
|
|
||||||
if (!active_cache_tree)
|
if (!active_cache_tree)
|
||||||
active_cache_tree = cache_tree();
|
active_cache_tree = cache_tree();
|
||||||
|
|
Loading…
Reference in a new issue