revert: refactor code into a do_pick_commit() function

diff --git a/bisect.c b/bisect.c
index 5c03398841e135a8f5941f89a43e0b02f7b02d57..b556b11610480afd80cddd86a81af9737254ee36 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -956,7 +956,7 @@ int bisect_next_all(const char *prefix)
 {
        struct rev_info revs;
        struct commit_list *tried;
-       int reaches = 0, all = 0, nr;
+       int reaches = 0, all = 0, nr, steps;
        const unsigned char *bisect_rev;
        char bisect_rev_hex[41];
 
@@ -986,6 +986,12 @@ int bisect_next_all(const char *prefix)
                exit(1);
        }
 
+       if (!all) {
+               fprintf(stderr, "No testable commit found.\n"
+                       "Maybe you started with bad path parameters?\n");
+               exit(4);
+       }
+
        bisect_rev = revs.commits->item->object.sha1;
        memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), 41);
 
@@ -998,8 +1004,10 @@ int bisect_next_all(const char *prefix)
        }
 
        nr = all - reaches - 1;
-       printf("Bisecting: %d revisions left to test after this "
-              "(roughly %d steps)\n", nr, estimate_bisect_steps(all));
+       steps = estimate_bisect_steps(all);
+       printf("Bisecting: %d revision%s left to test after this "
+              "(roughly %d step%s)\n", nr, (nr == 1 ? "" : "s"),
+              steps, (steps == 1 ? "" : "s"));
 
        return bisect_checkout(bisect_rev_hex);
 }