Merge branch 'jk/maint-cvsimport-fix' into maint

[git.git] / builtin-rev-list.c

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 8efd609b12e3c8cf20fbe1bf5c0d55643d34ea3c..9dbfae416c2ed563960e69cc6286891d37d576e0 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -84,7 +84,7 @@ static void show_commit(struct commit *commit)
                unsigned long buflen = 0;
                pretty_print_commit(revs.commit_format, commit, ~0,
                                    &buf, &buflen,
-                                   revs.abbrev, NULL, NULL, revs.date_mode);
+                                   revs.abbrev, NULL, NULL, revs.date_mode, 0);
                printf("%s%c", buf, hdr_termination);
                free(buf);
        }
@@ -300,7 +300,7 @@ static struct commit_list *find_bisection(struct commit_list *list,
        show_list("bisection 2 sorted", 0, nr, list);
 
        *all = nr;
-       weights = xcalloc(on_list, sizeof(int*));
+       weights = xcalloc(on_list, sizeof(*weights));
        counted = 0;
 
        for (n = 0, p = list; p; p = p->next) {