[PATCH 3/3] config tests: fix harmless but broken "rm -r" cleanup
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2022-06-21 22:21:55
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2022-06-21 22:21:55
Subsystem:
the rest · Maintainer:
Linus Torvalds
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. Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- t/t1300-config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index d3d9adbb3db..da4d03813f1 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh@@ -2083,7 +2083,7 @@ 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 -rf \"$HOME\"/.config/git" && cat >"$HOME"/.gitconfig <<-EOF && [home]
--
2.36.1.1239.gfba91521d90