From: Junio C Hamano <gitster@pobox.com>
To: Ramsay Jones <ramsay@ramsayjones.plus.com>
Cc: Elijah Newren <newren@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH] t6036: fix broken && chain in sub-shell
Date: Thu, 12 Jul 2018 11:48:45 -0700 [thread overview]
Message-ID: <xmqq4lh4xpbm.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <c9201ced-34a8-98f4-2da6-9c36c408b501@ramsayjones.plus.com> (Ramsay Jones's message of "Thu, 12 Jul 2018 16:32:25 +0100")
Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> Hi Junio,
>
> I had a test failure on 'pu' today - Eric's chain-lint series
> found another broken chain in one of Elijah's new tests (on the
> 'en/t6036-recursive-corner-cases' branch).
Thanks, I see the same breakage in my build, too.
>
> ATB,
> Ramsay Jones
>
> t/t6036-recursive-corner-cases.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
> index 2a44acace..59e52c5a0 100755
> --- a/t/t6036-recursive-corner-cases.sh
> +++ b/t/t6036-recursive-corner-cases.sh
> @@ -495,7 +495,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict
> test_write_lines 1 2 3 4 5 6 7 8 >a &&
> git add a &&
> git commit -m E3 &&
> - git tag E3
> + git tag E3 &&
>
> git checkout C^0 &&
> test_must_fail git merge B^0 &&
prev parent reply other threads:[~2018-07-12 18:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-12 15:32 [PATCH] t6036: fix broken && chain in sub-shell Ramsay Jones
2018-07-12 18:48 ` Junio C Hamano [this message]
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=xmqq4lh4xpbm.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=ramsay@ramsayjones.plus.com \
--cc=sunshine@sunshineco.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).