diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-10-31 04:46:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-09 22:59:49 +0300 |
| commit | a48fcd836971d065b9bf16b8cd046fd1aff9b279 (patch) | |
| tree | 34f868252e96a6cf1f7fe02014977f7fbb12d4c3 /t/t7610-mergetool.sh | |
| parent | 00648ba0505bbe1999bb6ae2f1d02a0ef923b191 (diff) | |
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/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 3bd74042ef..d78bdec330 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -54,7 +54,7 @@ test_expect_success 'custom mergetool' ' test_expect_success 'mergetool crlf' ' git config core.autocrlf true && - git checkout -b test2 branch1 + git checkout -b test2 branch1 && test_must_fail git merge master >/dev/null 2>&1 && ( yes "" | git mergetool file1 >/dev/null 2>&1 ) && ( yes "" | git mergetool file2 >/dev/null 2>&1 ) && |