diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-28 00:33:43 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-28 00:33:43 +0300 |
| commit | 986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a (patch) | |
| tree | 4ef3f9805cfdbf3b4496cb720a94c138df034204 /t/t4015-diff-whitespace.sh | |
| parent | fc0df933c8fa09603a9e9798085ee07ca1a83f65 (diff) | |
| parent | 1c5e94f459a0b7c23ef7e855441a65afdc4effab (diff) | |
Merge branch 'sg/test-must-be-empty'
Test fixes.
* sg/test-must-be-empty:
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'
tests: use 'test_must_be_empty' instead of 'test ! -s'
tests: use 'test_must_be_empty' instead of '! test -s'
Diffstat (limited to 't/t4015-diff-whitespace.sh')
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 35fc8b5c2a..a9fb226c5a 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -776,8 +776,6 @@ test_expect_success 'checkdiff allows new blank lines' ' git diff --check ' -cat <<EOF >expect -EOF test_expect_success 'whitespace-only changes not reported' ' git reset --hard && echo >x "hello world" && @@ -785,7 +783,7 @@ test_expect_success 'whitespace-only changes not reported' ' git commit -m "hello 1" && echo >x "hello world" && git diff -b >actual && - test_cmp expect actual + test_must_be_empty actual ' cat <<EOF >expect |