Re: [PATCH] t7507-*.sh: Fix test #8 (could not run '"$FAKE_EDITOR"')
flat view
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:59:17
Ramsay Jones [off-list ref] writes:
Signed-off-by: Ramsay Jones <redacted>
---
Hi Jens,
commit 61b6a633 ("commit -v: strip diffs and submodule shortlogs
from the commit message", 19-11-2013) in 'pu' fails the new test
it added to t7507.
I didn't spend too long looking at the problem, so take this patch
as nothing more than a quick suggestion for a possible solution! :-P
[The err file contained something like: "There was a problem with the
editor '"$FAKE_EDITOR"'"].
Having said that, this fixes it for me ...
Well spotted. test_must_fail being a shell function, not a command,
we shouldn't have used the "VAR=val cmd" one-shot environment
assignment for portability.
Even though this happens to be the last test in the script, using
test_set_editor to permanently affect the choice of editor for tests
that follow is not generally a good idea. It would be safer to do
this, I would have to say:
git commit -a -m "submodule commit"
) &&
(
GIT_EDITOR=cat &&
export GIT_EDITOR &&
test_must_fail git commit -a -v 2>err
) &&
test_i18ngrep "Aborting ..."
Thanks.
quoted hunk
ATB, Ramsay Jones t/t7507-commit-verbose.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh index 09c1150..49cfb3c 100755 --- a/t/t7507-commit-verbose.sh +++ b/t/t7507-commit-verbose.sh@@ -79,7 +79,8 @@ test_expect_success 'submodule log is stripped out too with -v' ' echo "more" >>file && git commit -a -m "submodule commit" ) && - GIT_EDITOR=cat test_must_fail git commit -a -v 2>err && + test_set_editor cat && + test_must_fail git commit -a -v 2>err && test_i18ngrep "Aborting commit due to empty commit message." err '