Merge branch 'jc/lockfile' into next

diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 3af24e767baae390484d2c5acec9aa25e09d9a91..2895140915cb603e2c5f971d0356f2e48106bc0e 100644 (file)
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -260,7 +260,7 @@ static void show_one_commit(struct commit *commit, int no_name)
        struct commit_name *name = commit->object.util;
        if (commit->object.parsed)
                pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
-                                   pretty, sizeof(pretty), 0);
+                                   pretty, sizeof(pretty), 0, NULL, NULL);
        else
                strcpy(pretty, "(unavailable)");
        if (!strncmp(pretty, "[PATCH] ", 8))