development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-05 16:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

check results of parse_commit in merge_bases

Browse source 
An error is signaled by returning NULL.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin Koegler 2008-02-18 21:47:57 +01:00 committed by Junio C Hamano
parent a301b0c8f2
commit 172947e645
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
commit.c
View file

@ -552,8 +552,10 @@ static struct commit_list *merge_bases(struct commit *one, struct commit *two)
*/
return commit_list_insert(one, &result);
parse_commit(one);
parse_commit(two);
if (parse_commit(one))
return NULL;
if (parse_commit(two))
return NULL;
one->object.flags |= PARENT1;
two->object.flags |= PARENT2;
@ -586,7 +588,8 @@ static struct commit_list *merge_bases(struct commit *one, struct commit *two)
parents = parents->next;
if ((p->object.flags & flags) == flags)
continue;
parse_commit(p);
if (parse_commit(p))
return NULL;
p->object.flags |= flags;
insert_by_date(p, &list);
}