@matheusbsbs / matheus-bagliano / commits / 89a70b80eb

t0302 & t3900: add forgotten quotes

When cleaning up files in the $HOME directory, it really makes sense to quote the path, especially in Git's test suite, where the HOME directory is *guaranteed* to contain spaces in its name. It would appear that those two tests pass even without cleaning up the files, but really more by pure chance than by design (the cleanup seems not actually to be necessary). However, if anybody would have a left-over `trash/` directory in Git's `t/` directory, these tests would fail, because they would all of a sudden try to delete that directory, but without the `-r` (recursive) flag. That is how this issue was found. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Jan 3, 2018 at 17:54 UTC 89a70b80ebabd237bb407f9321f24677f4f1d16d
2 files changed +5 -5
t/t0302-credential-store.sh
+1 -1
@@ -37,7 +37,7 @@ helper_test store
37 unset XDG_CONFIG_HOME
38
39 test_expect_success 'if custom xdg file exists, home and xdg files not created' '
40 - test_when_finished "rm -f $HOME/xdg/git/credentials" &&
40 + test_when_finished "rm -f \"$HOME/xdg/git/credentials\"" &&
41 test -s "$HOME/xdg/git/credentials" &&
42 test_path_is_missing "$HOME/.git-credentials" &&
43 test_path_is_missing "$HOME/.config/git/credentials"
t/t3900-i18n-commit.sh
+4 -4
@@ -40,7 +40,7 @@ test_expect_success 'UTF-16 refused because of NULs' '
40 '
41
42 test_expect_success 'UTF-8 invalid characters refused' '
43 - test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
43 + test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
44 echo "UTF-8 characters" >F &&
45 printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
46 >"$HOME/invalid" &&
@@ -49,7 +49,7 @@ test_expect_success 'UTF-8 invalid characters refused' '
49 '
50
51 test_expect_success 'UTF-8 overlong sequences rejected' '
52 - test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
52 + test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
53 rm -f "$HOME/stderr" "$HOME/invalid" &&
54 echo "UTF-8 overlong" >F &&
55 printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
@@ -59,7 +59,7 @@ test_expect_success 'UTF-8 overlong sequences rejected' '
59 '
60
61 test_expect_success 'UTF-8 non-characters refused' '
62 - test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
62 + test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
63 echo "UTF-8 non-character 1" >F &&
64 printf "Commit message\n\nNon-character:\364\217\277\276\n" \
65 >"$HOME/invalid" &&
@@ -68,7 +68,7 @@ test_expect_success 'UTF-8 non-characters refused' '
68 '
69
70 test_expect_success 'UTF-8 non-characters refused' '
71 - test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
71 + test_when_finished "rm -f \"$HOME/stderr $HOME/invalid\"" &&
72 echo "UTF-8 non-character 2." >F &&
73 printf "Commit message\n\nNon-character:\357\267\220\n" \
74 >"$HOME/invalid" &&