Skip to content

Commit ecc0869

Browse files
derrickstoleegitster
authored andcommitted
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 <[email protected]> Reported-by: ryenus <[email protected]> Signed-off-by: Derrick Stolee <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 44a4693 commit ecc0869

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

commit-graph.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ static void compute_generation_numbers(struct write_commit_graph_context *ctx)
11031103
struct commit_list *list = NULL;
11041104

11051105
if (ctx->report_progress)
1106-
ctx->progress = start_progress(
1106+
ctx->progress = start_delayed_progress(
11071107
_("Computing commit graph generation numbers"),
11081108
ctx->commits.nr);
11091109
for (i = 0; i < ctx->commits.nr; i++) {

t/t6500-gc.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ test_expect_success 'gc --no-quiet' '
109109
'
110110

111111
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 &&
113114
test_must_be_empty stdout &&
114115
test_i18ngrep "Enumerating objects" stderr &&
115116
test_i18ngrep "Computing commit graph generation numbers" stderr

0 commit comments

Comments
 (0)