diff options
author | Junio C Hamano <junkio@cox.net> | 2006-07-03 14:02:27 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-03 14:02:27 +0400 |
commit | 2ef108013ec15e8d5feee6d5c42692ae956ee302 (patch) | |
tree | a265f83e79f1483d3687dc02a29b998e95bdfc49 | |
parent | 542ccefe896a8960a6ce0b0ba4519537649ae29a (diff) |
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>
-rw-r--r-- | commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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); |