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/t5324-split-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/t5324-split-commit-graph.sh')
| -rwxr-xr-x | t/t5324-split-commit-graph.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh index 669ddc645f..36c4141e67 100755 --- a/t/t5324-split-commit-graph.sh +++ b/t/t5324-split-commit-graph.sh @@ -351,7 +351,8 @@ test_expect_success 'add octopus merge' ' git branch merge/octopus && git commit-graph write --reachable --split && git commit-graph verify --progress 2>err && - test_line_count = 3 err && + test_line_count = 1 err && + grep "Verifying commits in commit graph: 100% (18/18)" err && test_i18ngrep ! warning err && test_line_count = 3 $graphdir/commit-graph-chain ' |