From 99094a7ad484085b9f6849a8ebe1e23467c5bc14 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 20 Mar 2015 06:07:15 -0400 Subject: t: fix trivial &&-chain breakage These are tests which are missing a link in their &&-chain, but during a setup phase. We may fail to notice failure in commands that build the test environment, but these are typically not expected to fail at all (but it's still good to double-check that our test environment is what we expect). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t4041-diff-submodule-option.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 't/t4041-diff-submodule-option.sh') diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh index ff6134147..2d9731b52 100755 --- a/t/t4041-diff-submodule-option.sh +++ b/t/t4041-diff-submodule-option.sh @@ -528,10 +528,12 @@ test_expect_success 'diff --submodule with objects referenced by alternates' ' sha1_before=$(git rev-parse --short HEAD) echo b >b && git add b && - git commit -m b - sha1_after=$(git rev-parse --short HEAD) - echo "Submodule sub $sha1_before..$sha1_after: - > b" >../expected + git commit -m b && + sha1_after=$(git rev-parse --short HEAD) && + { + echo "Submodule sub $sha1_before..$sha1_after:" && + echo " > b" + } >../expected ) && (cd super && (cd sub && -- cgit v1.2.1