* [PATCH] t6036: fix broken && chain in sub-shell
@ 2018-07-12 15:32 Ramsay Jones
2018-07-12 18:48 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Ramsay Jones @ 2018-07-12 15:32 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Elijah Newren, Eric Sunshine, GIT Mailing-list
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).
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 &&
--
2.18.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] t6036: fix broken && chain in sub-shell
2018-07-12 15:32 [PATCH] t6036: fix broken && chain in sub-shell Ramsay Jones
@ 2018-07-12 18:48 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2018-07-12 18:48 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Elijah Newren, Eric Sunshine, GIT Mailing-list
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 &&
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-12 18:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-12 15:32 [PATCH] t6036: fix broken && chain in sub-shell Ramsay Jones
2018-07-12 18:48 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).