undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* vm/octopus-merge-bases-simplify:
  get_octopus_merge_bases(): cleanup redundant variable
This commit is contained in:
Junio C Hamano 2014-01-10 10:33:45 -08:00
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

34
commit.c
View File

@ -841,26 +841,26 @@ 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 *get_octopus_merge_bases(struct commit_list *in)
{ {
struct commit_list *i, *j, *k, *ret = NULL; struct commit_list *i, *j, *k, *ret = NULL;
struct commit_list **pptr = &ret;
for (i = in; i; i = i->next) { if (!in)
if (!ret) return ret;
pptr = &commit_list_insert(i->item, pptr)->next;
else {
struct commit_list *new = NULL, *end = NULL;
for (j = ret; j; j = j->next) { commit_list_insert(in->item, &ret);
struct commit_list *bases;
bases = get_merge_bases(i->item, j->item, 1); for (i = in->next; i; i = i->next) {
if (!new) struct commit_list *new = NULL, *end = NULL;
new = bases;
else for (j = ret; j; j = j->next) {
end->next = bases; struct commit_list *bases;
for (k = bases; k; k = k->next) bases = get_merge_bases(i->item, j->item, 1);
end = k; if (!new)
} new = bases;
ret = new; else
end->next = bases;
for (k = bases; k; k = k->next)
end = k;
} }
ret = new;
} }
return ret; return ret;
} }