diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-10 13:11:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-10 13:11:43 -0800 |
| commit | 41dac79c2f49f9ea1c808f0f208bde9aa4ed91cb (patch) | |
| tree | 0613e1a536b7af6ed7bf9d108ae3d7ea25976154 /commit-graph.c | |
| parent | 5dd1d59d35e1d8ea2101020df18298a9675d09b9 (diff) | |
| parent | ecc0869080701b5e252f74ed7b3d0156a5ec6112 (diff) | |
| download | git-41dac79c2f49f9ea1c808f0f208bde9aa4ed91cb.tar.gz | |
Merge branch 'ds/commit-graph-delay-gen-progress'
One kind of progress messages were always given during commit-graph
generation, instead of following the "if it takes more than two
seconds, show progress" pattern, which has been corrected.
* ds/commit-graph-delay-gen-progress:
commit-graph: use start_delayed_progress()
progress: create GIT_PROGRESS_DELAY
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/commit-graph.c b/commit-graph.c index 79bc5641cb..e771394aff 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1100,7 +1100,7 @@ static void compute_generation_numbers(struct write_commit_graph_context *ctx) struct commit_list *list = NULL; if (ctx->report_progress) - ctx->progress = start_progress( + ctx->progress = start_delayed_progress( _("Computing commit graph generation numbers"), ctx->commits.nr); for (i = 0; i < ctx->commits.nr; i++) { |