From 60687de5ba3eb90f8332fb1bcec73a2cb782c95c Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 20 Mar 2015 06:06:44 -0400 Subject: t: fix moderate &&-chain breakage These are tests which are missing a link in their &&-chain, but in a way that probably does not effect the outcome of the test. Most of these are of the form: some_cmd >actual test_cmp expect actual The main point of the test is to verify the output, and a failure in some_cmd would probably be noticed by bogus output. But it is good for the tests to also confirm that "some_cmd" does not die unexpectedly after producing its output. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t6028-merge-up-to-date.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t6028-merge-up-to-date.sh') diff --git a/t/t6028-merge-up-to-date.sh b/t/t6028-merge-up-to-date.sh index c518e9c30c..7763c1ba98 100755 --- a/t/t6028-merge-up-to-date.sh +++ b/t/t6028-merge-up-to-date.sh @@ -83,7 +83,7 @@ test_expect_success 'merge fast-forward octopus' ' git reset --hard c0 && test_tick && - git merge c1 c2 + git merge c1 c2 && expect=$(git rev-parse c2) && current=$(git rev-parse HEAD) && test "$expect" = "$current" -- cgit v1.2.3