summaryrefslogtreecommitdiff
path: root/builtin/commit-graph.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-07-15 16:29:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-07-15 16:29:45 -0700
commitd1ae8ba0963378f6613bfd683a969a94ca01b344 (patch)
treeff7c75e3196594ac032c200643aef2c4e1fe5c22 /builtin/commit-graph.c
parentMerge branch 'ct/diff-with-merge-base-clarification' into master (diff)
parentcommit-graph: fix "Collecting commits from input" progress line (diff)
downloadtgif-d1ae8ba0963378f6613bfd683a969a94ca01b344.tar.xz
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.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index f6797e2a9f..16c9f6101a 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;
}