commit-graph: use start_delayed_progress()
When writing a commit-graph, we show progress along several commit walks. When we use start_delayed_progress(), the progress line will only appear if that step takes a decent amount of time. However, one place was missed: computing generation numbers. This is normally a very fast operation as all commits have been parsed in a previous step. But, this is showing up for all users no matter how few commits are being added. The tests that check for the progress output have already been updated to use GIT_PROGRESS_DELAY=0 to force the expected output. Helped-by: Jeff King <peff@peff.net> Reported-by: ryenus <ryenus@gmail.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Nov 25, 2019 at 21:28 UTC
ecc0869080701b5e252f74ed7b3d0156a5ec6112
2 files changed
+3
-2
commit-graph.c
+1
-1
@@ -1103,7 +1103,7 @@ static void compute_generation_numbers(struct write_commit_graph_context *ctx)
1103
struct commit_list *list = NULL;
1104
1105
if (ctx->report_progress)
1106
- ctx->progress = start_progress(
1106
+ ctx->progress = start_delayed_progress(
1107
_("Computing commit graph generation numbers"),
1108
ctx->commits.nr);
1109
for (i = 0; i < ctx->commits.nr; i++) {
t/t6500-gc.sh
+2
-1
@@ -109,7 +109,8 @@ test_expect_success 'gc --no-quiet' '
109
'
110
111
test_expect_success TTY 'with TTY: gc --no-quiet' '
112
- test_terminal git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
112
+ test_terminal env GIT_PROGRESS_DELAY=0 \
113
+ git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
114
test_must_be_empty stdout &&
115
test_i18ngrep "Enumerating objects" stderr &&
116
test_i18ngrep "Computing commit graph generation numbers" stderr