diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-10-31 01:46:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-09 19:59:49 (GMT) |
| commit | a48fcd836971d065b9bf16b8cd046fd1aff9b279 (patch) | |
| tree | 34f868252e96a6cf1f7fe02014977f7fbb12d4c3 /t/t6024-recursive-merge.sh | |
| parent | 00648ba0505bbe1999bb6ae2f1d02a0ef923b191 (diff) | |
| download | git-a48fcd836971d065b9bf16b8cd046fd1aff9b279.zip git-a48fcd836971d065b9bf16b8cd046fd1aff9b279.tar.gz git-a48fcd836971d065b9bf16b8cd046fd1aff9b279.tar.bz2 | |
tests: add missing &&
Breaks in a test assertion's && chain can potentially hide
failures from earlier commands in the chain.
Commands intended to fail should be marked with !, test_must_fail, or
test_might_fail. The examples in this patch do not require that.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6024-recursive-merge.sh')
| -rwxr-xr-x | t/t6024-recursive-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index b3fbf65..755d30c 100755 --- a/t/t6024-recursive-merge.sh +++ b/t/t6024-recursive-merge.sh @@ -104,7 +104,7 @@ test_expect_success 'mark rename/delete as unmerged' ' test_tick && git commit -m delete && git checkout -b rename HEAD^ && - git mv a1 a2 + git mv a1 a2 && test_tick && git commit -m rename && test_must_fail git merge delete && |