diff options
| author | Alexander Pyhalov <apyhalov@gmail.com> | 2018-09-26 16:14:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-28 21:43:52 (GMT) |
| commit | b1492bf3151263f9fc72dafe468e84e6c01ac0c9 (patch) | |
| tree | 59cc60c61b018dee1db3a085dbacf3150f561a6b /t/t7005-editor.sh | |
| parent | 53f9a3e157dbbc901a02ac2c73346d375e24978c (diff) | |
| download | git-b1492bf3151263f9fc72dafe468e84e6c01ac0c9.zip git-b1492bf3151263f9fc72dafe468e84e6c01ac0c9.tar.gz git-b1492bf3151263f9fc72dafe468e84e6c01ac0c9.tar.bz2 | |
t7005-editor: quote filename to fix whitespace-issue
Commit 4362da078e (t7005-editor: get rid of the SPACES_IN_FILENAMES
prereq, 2018-05-14) removed code for detecting whether spaces in
filenames work. Since we rely on spaces throughout the test suite
("trash directory.t1234-foo"), testing whether we can use the filename
"e space.sh" was redundant and unnecessary.
In simplifying the code, though, this introduced a regression around how
spaces are handled, not in the /name/ of the editor script, but /in/ the
script itself. The script just does `echo space >$1`, where $1 is for
example "/foo/t/trash directory.t7005-editor/.git/COMMIT_EDITMSG".
With most shells, or with Bash in posix mode, $1 will not be subjected
to field splitting. But if we invoke Bash directly, which will happen if
we build Git with SHELL_PATH=/bin/bash, it will detect and complain
about an "ambiguous redirect". More details can be found in [1], thanks
to SZEDER Gábor.
Make sure that the editor script quotes "$1" to remove the ambiguity.
[1] https://public-inbox.org/git/20180926121107.GH27036@localhost/
Signed-off-by: Alexander Pyhalov <apyhalov@gmail.com>
Commit-message-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7005-editor.sh')
| -rwxr-xr-x | t/t7005-editor.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh index b2ca77b..5fcf281 100755 --- a/t/t7005-editor.sh +++ b/t/t7005-editor.sh @@ -112,7 +112,7 @@ do done test_expect_success 'editor with a space' ' - echo "echo space >\$1" >"e space.sh" && + echo "echo space >\"\$1\"" >"e space.sh" && chmod a+x "e space.sh" && GIT_EDITOR="./e\ space.sh" git commit --amend && test space = "$(git show -s --pretty=format:%s)" |