mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Don't add parents to the commit list if we have already
seen them. Otherwise any merges will make the parent list explode.
This commit is contained in:
parent
64745109c4
commit
4056c09114
7
commit.c
7
commit.c
|
@ -124,8 +124,11 @@ struct commit *pop_most_recent_commit(struct commit_list **list)
|
||||||
free(old);
|
free(old);
|
||||||
|
|
||||||
while (parents) {
|
while (parents) {
|
||||||
parse_commit(parents->item);
|
struct commit *commit = parents->item;
|
||||||
insert_by_date(list, parents->item);
|
if (!commit->object.parsed) {
|
||||||
|
parse_commit(commit);
|
||||||
|
insert_by_date(list, commit);
|
||||||
|
}
|
||||||
parents = parents->next;
|
parents = parents->next;
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in a new issue