From: Junio C Hamano <gitster@pobox.com>
To: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Cc: Jens.Lehmann@web.de, GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH] t7507-*.sh: Fix test #8 (could not run '"$FAKE_EDITOR"')
Date: Wed, 20 Nov 2013 09:22:31 -0800 [thread overview]
Message-ID: <xmqqsiur6l9k.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <528CE716.8060307@ramsay1.demon.co.uk> (Ramsay Jones's message of "Wed, 20 Nov 2013 16:45:10 +0000")
Ramsay Jones <ramsay@ramsay1.demon.co.uk> writes:
> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
> ---
>
> 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.
> 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
> '
next prev parent reply other threads:[~2013-11-20 17:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-20 16:45 [PATCH] t7507-*.sh: Fix test #8 (could not run '"$FAKE_EDITOR"') Ramsay Jones
2013-11-20 17:22 ` Junio C Hamano [this message]
2013-11-20 17:42 ` Jeff King
2013-11-20 18:33 ` Junio C Hamano
2013-11-20 18:54 ` Jeff King
2013-11-20 19:01 ` Jeff King
2013-11-20 19:35 ` Ramsay Jones
2013-11-20 21:32 ` Jens Lehmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsiur6l9k.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=ramsay@ramsay1.demon.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.