From: Junio C Hamano <junkio@cox.net>
Date: Mon, 3 Jul 2006 10:02:27 +0000 (-0700)
Subject: get_merge_bases: clean up even when there is no common commit.
X-Git-Tag: v1.4.2-rc1~77^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ef108013ec15e8d5feee6d5c42692ae956ee302;p=git.git

get_merge_bases: clean up even when there is no common commit.

Actually in this case we would have traversed a lot of commits, so cleaning
things up is even more important.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/commit.c b/commit.c
index a608faf23..12882fd49 100644
--- a/commit.c
+++ b/commit.c
@@ -1058,7 +1058,7 @@ struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2,
 	}
 
 	if (!result)
-		return NULL;
+		goto finish;
 
 	if (result->next && list)
 		mark_reachable_commits(result, list);
@@ -1081,6 +1081,7 @@ struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2,
 		tmp = next;
 	}
 
+ finish:
 	if (cleanup) {
 		clear_commit_marks(rev1, PARENT1 | PARENT2 | STALE);
 		clear_commit_marks(rev2, PARENT1 | PARENT2 | STALE);