kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'vm/octopus-merge-bases-simplify' 

* vm/octopus-merge-bases-simplify:
  get_octopus_merge_bases(): cleanup redundant variable
maint
Junio C Hamano 2014-01-10 10:33:45 -08:00
parent 2b2849765f 6bc76725ea
commit 4243b2d1e4
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
commit.c
View File

@ -841,12 +841,13 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co
struct commit_list *get_octopus_merge_bases(struct commit_list *in)
{
struct commit_list *i, *j, *k, *ret = NULL;
struct commit_list **pptr = &ret;

for (i = in; i; i = i->next) {
if (!ret)
pptr = &commit_list_insert(i->item, pptr)->next;
else {
if (!in)
return ret;

commit_list_insert(in->item, &ret);

for (i = in->next; i; i = i->next) {
struct commit_list *new = NULL, *end = NULL;

for (j = ret; j; j = j->next) {
@ -861,7 +862,6 @@ struct commit_list *get_octopus_merge_bases(struct commit_list *in)
}
ret = new;
}
}
return ret;
}