DORMANTno replies

[PATCH] t6036: fix broken && chain in sub-shell

From: Ramsay Jones <hidden>
Date: 2018-07-12 15:32:30
Subsystem: the rest · Maintainer: Linus Torvalds

Signed-off-by: Ramsay Jones <redacted>
---

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help