Merge branch 'cm/rebase-i-updates'

[thirdparty/git.git] / bisect.c

diff --git a/bisect.c b/bisect.c
index 75ea0eb57ff18979702b0abd5da345f27948e530..af2863d044b704f3b7e9d6617dbb2226d4c8a1fe 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -423,7 +423,7 @@ void find_bisection(struct commit_list **commit_list, int *reaches,
        show_list("bisection 2 sorted", 0, nr, list);
 
        *all = nr;
-       weights = xcalloc(on_list, sizeof(*weights));
+       CALLOC_ARRAY(weights, on_list);
 
        /* Do the real work of finding bisection commit. */
        best = do_find_bisection(list, nr, weights, bisect_flags);
@@ -1064,7 +1064,7 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
 
        if (!all) {
                fprintf(stderr, _("No testable commit found.\n"
-                       "Maybe you started with bad path parameters?\n"));
+                       "Maybe you started with bad path arguments?\n"));
 
                return BISECT_NO_TESTABLE_COMMIT;
        }