Merge branch 'jk/patch-ids-no-merges' into maint

diff --git a/builtin/log.c b/builtin/log.c
index 1f116bea8c8873d652f573db2047c558fa51bbd3..92dc34dcb0cc54df27b99c91d08786b6c0d5b62a 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1343,7 +1343,7 @@ static void prepare_bases(struct base_tree_info *bases,
                struct object_id *patch_id;
                if (commit->util)
                        continue;
-               if (commit_patch_id(commit, &diffopt, sha1))
+               if (commit_patch_id(commit, &diffopt, sha1, 0))
                        die(_("cannot get patch id"));
                ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id);
                patch_id = bases->patch_id + bases->nr_patch_id;