Merge branch 'jk/progress-delay-fix'

diff --git a/builtin/commit.c b/builtin/commit.c
index cfb78fcf680f4aea96035d0158b2855a1358d674..8a877014145435516930c787dec37b8c4ac3da90 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1750,7 +1750,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                                allow_fast_forward = 0;
                }
                if (allow_fast_forward)
-                       parents = reduce_heads(parents);
+                       reduce_heads_replace(&parents);
        } else {
                if (!reflog_msg)
                        reflog_msg = (whence == FROM_CHERRY_PICK)