From 6bc76725eaa2f4bb8c5fad47f843425d9160e7f3 Mon Sep 17 00:00:00 2001 From: Vasily Makarov Date: Fri, 3 Jan 2014 18:45:46 +0400 Subject: [PATCH] get_octopus_merge_bases(): cleanup redundant variable pptr is needless. Some related code got cleaned as well. Signed-off-by: Vasily Makarov Signed-off-by: Junio C Hamano --- commit.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/commit.c b/commit.c index 5df1df7351..249a83b0cc 100644 --- a/commit.c +++ b/commit.c @@ -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 *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 { - struct commit_list *new = NULL, *end = NULL; - - for (j = ret; j; j = j->next) { - struct commit_list *bases; - bases = get_merge_bases(i->item, j->item, 1); - if (!new) - new = bases; - else - end->next = bases; - for (k = bases; k; k = k->next) - end = k; - } - ret = new; + 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) { + struct commit_list *bases; + bases = get_merge_bases(i->item, j->item, 1); + if (!new) + new = bases; + else + end->next = bases; + for (k = bases; k; k = k->next) + end = k; } + ret = new; } return ret; }