path: root/merge-base.c
diff options
authorRene Scharfe <>2006-07-02 09:49:38 (GMT)
committerJunio C Hamano <>2006-07-02 17:58:25 (GMT)
commitc0fa8255c652e148f0910425d2cc2b8029065008 (patch)
treeb649c755844913b1637b914ef6398707b8907021 /merge-base.c
parent31aea7ef77aff64a02afe1ea5f10375565911808 (diff)
Fold get_merge_bases_clean() into get_merge_bases()
Change get_merge_bases() to be able to clean up after itself if needed by adding a cleanup parameter. We don't need to save the flags and restore them afterwards anymore; that was a leftover from before the flags were moved out of the range used in revision.c. clear_commit_marks() sets them to zero, which is enough. Signed-off-by: Rene Scharfe <> Acked-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'merge-base.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-base.c b/merge-base.c
index b41f76c..59f723f 100644
--- a/merge-base.c
+++ b/merge-base.c
@@ -6,7 +6,7 @@ static int show_all = 0;
static int merge_base(struct commit *rev1, struct commit *rev2)
- struct commit_list *result = get_merge_bases(rev1, rev2);
+ struct commit_list *result = get_merge_bases(rev1, rev2, 0);
if (!result)
return 1;