| Message ID | patch-v2-3.3-d3f65326701-20220630T101646Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | eb1cd60290d3898ef3c3293a11400f9fff9376cd |
| Headers | show |
| Series | tests: fix tests broken if a " " is in the checkout dir's path | expand |
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes: > diff --git a/t/t1300-config.sh b/t/t1300-config.sh > index d3d9adbb3db..c6661e61af5 100755 > --- a/t/t1300-config.sh > +++ b/t/t1300-config.sh > @@ -2083,12 +2083,13 @@ test_expect_success '--show-scope with --show-origin' ' > ' > > test_expect_success 'override global and system config' ' > - test_when_finished rm -f "$HOME"/.config/git && > - > + test_when_finished rm -f \"\$HOME\"/.gitconfig && This does look more correct than the original. > cat >"$HOME"/.gitconfig <<-EOF && > [home] > config = true > EOF > + > + test_when_finished rm -rf \"\$HOME\"/.config/git && > mkdir -p "$HOME"/.config/git && > cat >"$HOME"/.config/git/config <<-EOF && > [xdg] Nicely done. Will queue. Thanks.
diff --git a/t/t1300-config.sh b/t/t1300-config.sh index d3d9adbb3db..c6661e61af5 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -2083,12 +2083,13 @@ test_expect_success '--show-scope with --show-origin' ' ' test_expect_success 'override global and system config' ' - test_when_finished rm -f "$HOME"/.config/git && - + test_when_finished rm -f \"\$HOME\"/.gitconfig && cat >"$HOME"/.gitconfig <<-EOF && [home] config = true EOF + + test_when_finished rm -rf \"\$HOME\"/.config/git && mkdir -p "$HOME"/.config/git && cat >"$HOME"/.config/git/config <<-EOF && [xdg]
The "test_when_finished" cleanup phase added in 4179b4897f2 (config: allow overriding of global and system configuration, 2021-04-19) has never worked as intended, firstly the ".config/git" is a directory, so we'd need the "-r" flag, but more importantly the $HOME variable wasn't properly quoted. We'd thus end up trying to remove the "trash" part of "trash directory", which wouldn't fail with "-f", since "rm -f" won't fail on non-existing files. It's possible that this would have caused an actual failure if someone had a $HOME with a space character in it, such that our "rm -f" would fail to remove an existing directory, but in practice that probably never happened. Let's fix both the quoting issue, and the other issue cleanup issue in 4179b4897f2, which is that we were attempting to clean up ~/.config/git, but weren't cleaing up ~/.gitconfig. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- t/t1300-config.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)