revision: forbid combining --graph and --no-walk

diff --git a/submodule.c b/submodule.c
index 0690dc50d07e9fd30242e41afe149476a34fc105..d37d400b2227c58f352795b9f6ede20a9cd54631 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;