mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/pop-commit' into maint

Browse Source 
Code simplification.

* rs/pop-commit:
  use pop_commit() for consuming the first entry of a struct commit_list
This commit is contained in:
Junio C Hamano
2015-12-11 11:14:12 -08:00
parent 8c0a546670 e510ab8988
commit 0af22d6fff
10 changed files with 31 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/merge.c
View File

@ -1019,7 +1019,7 @@ static struct commit_list *reduce_parents(struct commit *head_commit,
int *head_subsumed,
struct commit_list *remoteheads)
{
struct commit_list *parents, *next, **remotes = &remoteheads;
struct commit_list *parents, **remotes;
/*
* Is the current HEAD reachable from another commit being
@ -1033,16 +1033,14 @@ static struct commit_list *reduce_parents(struct commit *head_commit,
/* Find what parents to record by checking independent ones. */
parents = reduce_heads(remoteheads);
for (remoteheads = NULL, remotes = &remoteheads;
parents;
parents = next) {
struct commit *commit = parents->item;
next = parents->next;
remoteheads = NULL;
remotes = &remoteheads;
while (parents) {
struct commit *commit = pop_commit(&parents);
if (commit == head_commit)
*head_subsumed = 0;
else
remotes = &commit_list_insert(commit, remotes)->next;
free(parents);
}
return remoteheads;
}