refuse to merge during a merge

[git.git] / bisect.c

diff --git a/bisect.c b/bisect.c
index 69f8860ca1ac54ed4bc135017bce8e3ab6d9cbe2..58f7e6f7738def184072247f934cce06d349c91d 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -535,8 +535,13 @@ static void bisect_rev_setup(struct rev_info *revs, const char *prefix)
 int bisect_next_vars(const char *prefix)
 {
        struct rev_info revs;
+       struct rev_list_info info;
        int reaches = 0, all = 0;
 
+       memset(&info, 0, sizeof(info));
+       info.revs = &revs;
+       info.bisect_show_flags = BISECT_SHOW_TRIED | BISECT_SHOW_STRINGED;
+
        bisect_rev_setup(&revs, prefix);
 
        if (prepare_revision_walk(&revs))
@@ -547,6 +552,5 @@ int bisect_next_vars(const char *prefix)
        revs.commits = find_bisection(revs.commits, &reaches, &all,
                                      !!skipped_sha1_nr);
 
-       return show_bisect_vars(&revs, reaches, all,
-                               BISECT_SHOW_TRIED | BISECT_SHOW_STRINGED);
+       return show_bisect_vars(&info, reaches, all);
 }