Merge branch 'tb/commit-graph-no-check-oids' into master

Fix to the code to produce progress bar, which is new in the
upcoming release.

* tb/commit-graph-no-check-oids:
  commit-graph: fix "Collecting commits from input" progress line

diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index f6797e2a9fb3210192dc65a044b084458ab632d6..16c9f6101aa7627f5914cc7f08d2ddd3af96cc1e 100644 (file)
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -251,7 +251,7 @@ static int graph_write(int argc, const char **argv)
                        }
                }
 
-
+               stop_progress(&progress);
        }
 
        if (write_commit_graph(odb,
@@ -264,8 +264,6 @@ static int graph_write(int argc, const char **argv)
 cleanup:
        string_list_clear(&pack_indexes, 0);
        strbuf_release(&buf);
-       if (progress)
-               stop_progress(&progress);
        return result;
 }