Fold get_merge_bases_clean() into get_merge_bases()

diff --git a/commit.c b/commit.c
index 70a4effe5b28d49a0228ec182f0d89b356537924..94c1d0ec5903d8987e31847d1ff217f9852df105 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1012,7 +1012,8 @@ static void mark_reachable_commits(struct commit_list *result,
        }
 }
 
-struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2)
+struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2,
+                                    int cleanup)
 {
        struct commit_list *list = NULL;
        struct commit_list *result = NULL;
@@ -1080,20 +1081,10 @@ struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2)
                tmp = next;
        }
 
-       return result;
-}
-
-struct commit_list *get_merge_bases_clean(struct commit *rev1,
-                                          struct commit *rev2)
-{
-       unsigned int flags1 = rev1->object.flags;
-       unsigned int flags2 = rev2->object.flags;
-       struct commit_list *result = get_merge_bases(rev1, rev2);
-
-       clear_commit_marks(rev1, PARENT1 | PARENT2 | UNINTERESTING);
-       clear_commit_marks(rev2, PARENT1 | PARENT2 | UNINTERESTING);
-       rev1->object.flags = flags1;
-       rev2->object.flags = flags2;
+       if (cleanup) {
+               clear_commit_marks(rev1, PARENT1 | PARENT2 | UNINTERESTING);
+               clear_commit_marks(rev2, PARENT1 | PARENT2 | UNINTERESTING);
+       }
 
        return result;
 }