]> git.ipfire.org Git - thirdparty/git.git/commit
fsck: suppress commit-graph output with `--no-progress`
authorTaylor Blau <me@ttaylorr.com>
Sat, 8 Jul 2023 00:31:31 +0000 (20:31 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2023 17:02:37 +0000 (10:02 -0700)
commiteda206f61125ec5e0985809c1cf0a853abca2ae7
treee6f247fa9b6aa0fbfe02b695b8efeadc8c1dad75
parentfb7d80edcae482f4fa5d4be0227dc3054734e5f3
fsck: suppress commit-graph output with `--no-progress`

Since e0fd51e1d7 (fsck: verify commit-graph, 2018-06-27), `fsck` runs
`git commit-graph verify` to check the integrity of any commit-graph(s).

Originally, the `git commit-graph verify` step would always print to
stdout/stderr, regardless of whether or not `fsck` was invoked with
`--[no-]progress` or not. But in 7371612255 (commit-graph: add
--[no-]progress to write and verify, 2019-08-26), the commit-graph
machinery learned the `--[no-]progress` option, though `fsck` was not
updated to pass this new flag (or not).

This led to seeing output from running `git fsck`, even with
`--no-progress` on repositories that have a commit-graph:

    $ git.compile fsck --connectivity-only --no-progress --no-dangling
    Verifying commits in commit graph: 100% (4356/4356), done.
    Verifying commits in commit graph: 100% (131912/131912), done.

Ensure that `fsck` passes `--[no-]progress` as appropriate when calling
`git commit-graph verify`.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Acked-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/fsck.c
t/t5318-commit-graph.sh