diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-18 07:28:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-18 07:28:53 -0700 |
| commit | 6016ee0a7130d3ad656def12d724d1525d39af9b (patch) | |
| tree | bd79cfd02f73ec3044a285b7a3ea633607c4ef70 /t/t5318-commit-graph.sh | |
| parent | Merge branch 'mh/doc-credential-helpers' (diff) | |
| parent | commit-graph.c: avoid duplicated progress output during `verify` (diff) | |
| download | git-6016ee0a7130d3ad656def12d724d1525d39af9b.tar.gz git-6016ee0a7130d3ad656def12d724d1525d39af9b.zip | |
Merge branch 'tb/fsck-no-progress'
"git fsck --no-progress" still spewed noise from the commit-graph
subsystem, which has been corrected.
* tb/fsck-no-progress:
commit-graph.c: avoid duplicated progress output during `verify`
commit-graph.c: pass progress to `verify_one_commit_graph()`
commit-graph.c: iteratively verify commit-graph chains
commit-graph.c: extract `verify_one_commit_graph()`
fsck: suppress MIDX output with `--no-progress`
fsck: suppress commit-graph output with `--no-progress`
Diffstat (limited to 't/t5318-commit-graph.sh')
| -rwxr-xr-x | t/t5318-commit-graph.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index b6e1211578..bf8a92317b 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -684,6 +684,16 @@ test_expect_success 'git fsck (checks commit-graph when config unset)' ' test_must_fail git fsck ' +test_expect_success 'git fsck shows commit-graph output with --progress' ' + git -C "$TRASH_DIRECTORY/full" fsck --progress 2>err && + grep "Verifying commits in commit graph" err +' + +test_expect_success 'git fsck suppresses commit-graph output with --no-progress' ' + git -C "$TRASH_DIRECTORY/full" fsck --no-progress 2>err && + ! grep "Verifying commits in commit graph" err +' + test_expect_success 'setup non-the_repository tests' ' rm -rf repo && git init repo && |