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

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2006-07-03 03:02:27 -07:00
parent 542ccefe89
commit 2ef108013e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
commit.c
View File

@ -1058,7 +1058,7 @@ struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2,
} }
if (!result) if (!result)
return NULL; goto finish;
if (result->next && list) if (result->next && list)
mark_reachable_commits(result, list); mark_reachable_commits(result, list);
@ -1081,6 +1081,7 @@ struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2,
tmp = next; tmp = next;
} }
finish:
if (cleanup) { if (cleanup) {
clear_commit_marks(rev1, PARENT1 | PARENT2 | STALE); clear_commit_marks(rev1, PARENT1 | PARENT2 | STALE);
clear_commit_marks(rev2, PARENT1 | PARENT2 | STALE); clear_commit_marks(rev2, PARENT1 | PARENT2 | STALE);