diff options
| author | Taylor Blau <me@ttaylorr.com> | 2020-09-09 17:22:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-09 21:51:48 +0200 |
| commit | 025d52943e89ad01791bb5c4db106b87ebfe3889 (patch) | |
| tree | 1d8e6668007692963e37d1dd68719674e0eea8e1 /t/t4216-log-bloom.sh | |
| parent | commit-graph: introduce 'get_bloom_filter_settings()' (diff) | |
| download | git-025d52943e89ad01791bb5c4db106b87ebfe3889.tar.xz git-025d52943e89ad01791bb5c4db106b87ebfe3889.zip | |
t4216: use an '&&'-chain
In a759bfa9ee (t4216: add end to end tests for git log with Bloom
filters, 2020-04-06), a 'rm' invocation was added without a
corresponding '&&' chain.
When 'trace.perf' already exists, everything works fine. However, the
function can be executed without 'trace.perf' on disk (eg., when the
subset of tests run is altered with '--run'), and so the bare 'rm'
complains about a missing file.
To remove some noise from the test log, invoke 'rm' with '-f', at which
point it is sensible to place the 'rm -f' in an '&&'-chain, which is
both (1) our usual style, and (2) avoids a broken chain in the future if
more commands are added at the beginning of the function.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rwxr-xr-x | t/t4216-log-bloom.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4216-log-bloom.sh b/t/t4216-log-bloom.sh index c9f9bdf1ba..fe19f6a60c 100755 --- a/t/t4216-log-bloom.sh +++ b/t/t4216-log-bloom.sh @@ -53,7 +53,7 @@ sane_unset GIT_TRACE2_PERF_BRIEF sane_unset GIT_TRACE2_CONFIG_PARAMS setup () { - rm "$TRASH_DIRECTORY/trace.perf" + rm -f "$TRASH_DIRECTORY/trace.perf" && git -c core.commitGraph=false log --pretty="format:%s" $1 >log_wo_bloom && GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.perf" git -c core.commitGraph=true log --pretty="format:%s" $1 >log_w_bloom } |