diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-16 02:29:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-16 02:29:45 +0300 |
| commit | d1ae8ba0963378f6613bfd683a969a94ca01b344 (patch) | |
| tree | ff7c75e3196594ac032c200643aef2c4e1fe5c22 /builtin/commit-graph.c | |
| parent | 1863dbdde9dfcea3c51940cc106b699dedbebff8 (diff) | |
| parent | 862aead24eaf797860fb503561a1f86adf557abb (diff) | |
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
Diffstat (limited to 'builtin/commit-graph.c')
| -rw-r--r-- | builtin/commit-graph.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index f6797e2a9fb..16c9f6101aa 100644 --- 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; } |