Thanks, Ryenus, for reporting this problem. Update in V3: Based on our discussion, I've added the suggested GIT_PROGRESS_DELAY environment variable. This allowed the existing tests to stick around with one exception in the GC tests. The test remains, but we can no longer look at the commit-graph output. Update in V4: The GIT_PROGRESS_DELAY check is extracted to a helper method so it can be used with start_delayed_sparse_progress(). Update in V5: I took Peff's advice for using "env" to use this delay in the GC test. Derrick Stolee (2): progress: create GIT_PROGRESS_DELAY commit-graph: use start_delayed_progress() Documentation/git.txt | 4 ++++ commit-graph.c | 2 +- progress.c | 15 +++++++++++++-- t/t5318-commit-graph.sh | 4 ++-- t/t6500-gc.sh | 6 +++--- 5 files changed, 23 insertions(+), 8 deletions(-) base-commit: da72936f544fec5a335e66432610e4cef4430991 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-450%2Fderrickstolee%2Fcommit-graph-progress-fix-v5 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-450/derrickstolee/commit-graph-progress-fix-v5 Pull-Request: https://github.com/gitgitgadget/git/pull/450 Range-diff vs v4: 1: a7acdf9c8f = 1: a7acdf9c8f progress: create GIT_PROGRESS_DELAY 2: e62dcc1ce5 ! 2: efe1419dc6 commit-graph: use start_delayed_progress() @@ -12,13 +12,9 @@ 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. However, there - is one test in t6500-gc.sh that uses the test_terminal method. This - mechanism does not preserve the GIT_PROGRESS_DELAY environment variable, - so we need to modify check on the output. We still watch for the - "Enumerating objects" progress but no longer look for "Computing - commit graph generation numbers". + to use GIT_PROGRESS_DELAY=0 to force the expected output. + Helped-by: Jeff King <peff@xxxxxxxx> Reported-by: ryenus <ryenus@xxxxxxxxx> Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx> @@ -39,12 +35,12 @@ --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ - test_expect_success TTY 'with TTY: gc --no-quiet' ' - test_terminal git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && - test_must_be_empty stdout && -- test_i18ngrep "Enumerating objects" stderr && -- test_i18ngrep "Computing commit graph generation numbers" stderr -+ test_i18ngrep "Enumerating objects" stderr ' - test_expect_success 'gc --quiet' ' + test_expect_success TTY 'with TTY: gc --no-quiet' ' +- test_terminal git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && ++ test_terminal env GIT_PROGRESS_DELAY=0 \ ++ git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && + test_must_be_empty stdout && + test_i18ngrep "Enumerating objects" stderr && + test_i18ngrep "Computing commit graph generation numbers" stderr -- gitgitgadget
