fsck: suppress commit-graph output with `--no-progress`
Sincemainte0fd51e1d7
(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 in7371612255
(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>
parent
fb7d80edca
commit
eda206f611
builtin
|
@ -1072,6 +1072,10 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
|
|||
commit_graph_verify.git_cmd = 1;
|
||||
strvec_pushl(&commit_graph_verify.args, "commit-graph",
|
||||
"verify", "--object-dir", odb->path, NULL);
|
||||
if (show_progress)
|
||||
strvec_push(&commit_graph_verify.args, "--progress");
|
||||
else
|
||||
strvec_push(&commit_graph_verify.args, "--no-progress");
|
||||
if (run_command(&commit_graph_verify))
|
||||
errors_found |= ERROR_COMMIT_GRAPH;
|
||||
}
|
||||
|
|
|
@ -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 &&
|
||||
|
|
Loading…
Reference in New Issue