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

Merge branch 'rs/pop-commit'

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-10-30 13:07:03 -07:00
parent 23d58a00e5 e510ab8988
commit 0692a6c22c
10 changed files with 31 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/fmt-merge-msg.c
View File

@ -537,7 +537,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
static void find_merge_parents(struct merge_parents *result,
struct strbuf *in, unsigned char *head)
{
struct commit_list *parents, *next;
struct commit_list *parents;
struct commit *head_commit;
int pos = 0, i, j;
@ -576,13 +576,10 @@ static void find_merge_parents(struct merge_parents *result,
parents = reduce_heads(parents);
while (parents) {
struct commit *cmit = pop_commit(&parents);
for (i = 0; i < result->nr; i++)
if (!hashcmp(result->item[i].commit,
parents->item->object.sha1))
if (!hashcmp(result->item[i].commit, cmit->object.sha1))
result->item[i].used = 1;
next = parents->next;
free(parents);
parents = next;
}
for (i = j = 0; i < result->nr; i++) {