Merge branch 'cm/rebase-i-updates'

[thirdparty/git.git] / bisect.c

diff --git a/bisect.c b/bisect.c
index 67f7dcacd2b2ebb80bf7794854c794472808f84b..af2863d044b704f3b7e9d6617dbb2226d4c8a1fe 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -6,7 +6,7 @@
 #include "refs.h"
 #include "list-objects.h"
 #include "quote.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
 #include "run-command.h"
 #include "log-tree.h"
 #include "bisect.h"
@@ -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);