diff options
| author | Jeff King <peff@peff.net> | 2015-03-20 06:06:44 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 10:20:13 -0700 |
| commit | 60687de5ba3eb90f8332fb1bcec73a2cb782c95c (patch) | |
| tree | 33192f9dd985cd6ebc82726e4a4d4ce96cbcad3c /t/t6028-merge-up-to-date.sh | |
| parent | 8fb268720e8565885039e7491f4628974e2d66a2 (diff) | |
| download | git-60687de5ba3eb90f8332fb1bcec73a2cb782c95c.tar.gz git-60687de5ba3eb90f8332fb1bcec73a2cb782c95c.tar.xz | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6028-merge-up-to-date.sh')
| -rwxr-xr-x | t/t6028-merge-up-to-date.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6028-merge-up-to-date.sh b/t/t6028-merge-up-to-date.sh index c518e9c30..7763c1ba9 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" |