diff options
| author | Jeff King <peff@peff.net> | 2012-07-26 16:28:00 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-26 14:23:35 -0700 |
| commit | 34565f27fef10546a62c734c55c0d280aad63460 (patch) | |
| tree | 1e030e05febb3b7e4e7bc6fe3f9328c59f8060e2 | |
| parent | a9ebc43bd07e219922d1dab17df319f1cae5d600 (diff) | |
| download | git-34565f27fef10546a62c734c55c0d280aad63460.tar.gz git-34565f27fef10546a62c734c55c0d280aad63460.tar.xz | |
t7502: properly quote GIT_EDITOR
One of the tests tries to ensure that editor is not run due
to an early failure. However, it needs to quote the pathname
of the trash directory used in $GIT_EDITOR, since git will
pass it along to the shell. In other words, the test would
pass whether the code was correct or not, since the unquoted
editor specification would never run.
We never noticed the problem because the code is indeed
correct, so git-commit never even tried to run the editor.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t7502-commit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index ddce53a96..3f9fb55a4 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -290,7 +290,7 @@ test_expect_success 'do not fire editor in the presence of conflicts' ' test_must_fail git cherry-pick -n master && echo "editor not started" >.git/result && ( - GIT_EDITOR="$(pwd)/.git/FAKE_EDITOR" && + GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" && export GIT_EDITOR && test_must_fail git commit ) && |