Skip to content

fsck: squelch progress output with `--no-progress`

Taylor Blau git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6fsck: suppress commit-graph output with `--no-progress`builtin/fsck.c t/t5318-commit-graph.sh+14 -00 replies
2/6fsck: suppress MIDX output with `--no-progress`builtin/fsck.c t/t5319-multi-pack-index.sh+16 -00 replies
3/6commit-graph.c: extract `verify_one_commit_graph()`commit-graph.c+16 -80 replies
4/6commit-graph.c: iteratively verify commit-graph chainscommit-graph.c+5 -40 replies
5/6commit-graph.c: pass progress to `verify_one_commit_graph()`commit-graph.c+9 -80 replies
6/6commit-graph.c: avoid duplicated progress output during `verify`commit-graph.c t/t5324-split-commit-graph.sh+19 -110 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/6] fsck: squelch progress output with `--no-progress`

This short series addresses a pair of issues where the commit-graph verify and multi-pack-index verify steps of git fsck produce output regardless of whether or not fsck was invoked with the --no-progress option or not.

The first two patches address the commit-graph and MIDX issues respectively. The final four patches further clean up the output of git commit-graph verify --progress when verifying multi-layer graphs to produce a single progress meter instead of one per graph layer.

Before, the output of git commit-graph verify on a repository with a commit-graph chain with two layers looked like:

    $ git.compile commit-graph verify
    Verifying commits in commit graph: 100% (4356/4356), done.
    Verifying commits in commit graph: 100% (131912/131912), done.

After this patch series, the output instead looks as follows:

    $ git.compile commit-graph verify
    Verifying commits in commit graph: 100% (136268/136268), done.

Thanks in advance for your review.

Taylor Blau (6):
fsck: suppress commit-graph output with --no-progress
fsck: suppress MIDX output with --no-progress commit-graph.c: extract verify_one_commit_graph() commit-graph.c: iteratively verify commit-graph chains commit-graph.c: pass progress to verify_one_commit_graph() commit-graph.c: avoid duplicated progress output during verify

 builtin/fsck.c                |  8 ++++++
 commit-graph.c                | 53 +++++++++++++++++++++++------------
 t/t5318-commit-graph.sh       | 10 +++++++
 t/t5319-multi-pack-index.sh   | 12 ++++++++
 t/t5324-split-commit-graph.sh |  3 +-
 5 files changed, 67 insertions(+), 19 deletions(-)
Signature · 1 line
2.41.0.242.g6eec849fa5a