diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-10-31 07:30:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-09 22:45:22 (GMT) |
| commit | 2dec68cf8fec760930c3bc9d13beb17e381d70a3 (patch) | |
| tree | fb6354e2071434ba8d2e64bc90c8087d0da8c29e /t/t4124-apply-ws-rule.sh | |
| parent | a48fcd836971d065b9bf16b8cd046fd1aff9b279 (diff) | |
| download | git-2dec68cf8fec760930c3bc9d13beb17e381d70a3.zip git-2dec68cf8fec760930c3bc9d13beb17e381d70a3.tar.gz git-2dec68cf8fec760930c3bc9d13beb17e381d70a3.tar.bz2 | |
tests: add missing &&, batch 2
Same rules as before: this patch only adds " &&" to the end of
some lines in the test suite.
Intended to be applied on top of or squashed with the last
batch if they look okay.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4124-apply-ws-rule.sh')
| -rwxr-xr-x | t/t4124-apply-ws-rule.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh index 8a676a5..414b09b 100755 --- a/t/t4124-apply-ws-rule.sh +++ b/t/t4124-apply-ws-rule.sh @@ -368,7 +368,7 @@ test_expect_success 'missing blanks at EOF must only match blank lines' ' git diff -- one >patch && echo a >one && - test_must_fail git apply patch + test_must_fail git apply patch && test_must_fail git apply --whitespace=fix patch && test_must_fail git apply --ignore-space-change --whitespace=fix patch ' @@ -419,7 +419,7 @@ test_expect_success 'same, but with CR-LF line endings && cr-at-eol set' ' printf "b\r\n" >>one && printf "c\r\n" >>one && cp one save-one && - printf " \r\n" >>one + printf " \r\n" >>one && git add one && printf "d\r\n" >>one && cp one expect && @@ -436,7 +436,7 @@ test_expect_success 'same, but with CR-LF line endings && cr-at-eol unset' ' printf "b\r\n" >>one && printf "c\r\n" >>one && cp one save-one && - printf " \r\n" >>one + printf " \r\n" >>one && git add one && cp one expect && printf "d\r\n" >>one && |