get_merge_bases(): always clean-up object flags

[thirdparty/git.git] / submodule.c

diff --git a/submodule.c b/submodule.c
index b80ecacf60dc87025336b6b6d6a51acc9321f429..10b2ddb870f6a80cca6ebba977238c88f3aaf767 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -301,7 +301,7 @@ static int prepare_submodule_summary(struct rev_info *rev, const char *path,
        left->object.flags |= SYMMETRIC_LEFT;
        add_pending_object(rev, &left->object, path);
        add_pending_object(rev, &right->object, path);
-       merge_bases = get_merge_bases(left, right, 1);
+       merge_bases = get_merge_bases(left, right);
        if (merge_bases) {
                if (merge_bases->item == left)
                        *fast_forward = 1;