diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-21 17:07:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-21 17:07:51 -0800 |
| commit | 9a01387b9714452ebcae431705a288e1a7e099c3 (patch) | |
| tree | cd740cca16bcf94af4221fc43111e872e6ae3622 /t | |
| parent | Merge branch 'lt/maint-wrap-zlib' (diff) | |
| parent | Fix combined use of whitespace ignore options to diff (diff) | |
| download | tgif-9a01387b9714452ebcae431705a288e1a7e099c3.tar.xz | |
Merge branch 'kc/maint-diff-bwi-fix'
* kc/maint-diff-bwi-fix:
Fix combined use of whitespace ignore options to diff
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index dbb608cf79..6d13da30da 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -99,11 +99,11 @@ EOF git diff -w > out test_expect_success 'another test, with -w' 'test_cmp expect out' git diff -w -b > out -test_expect_failure 'another test, with -w -b' 'test_cmp expect out' +test_expect_success 'another test, with -w -b' 'test_cmp expect out' git diff -w --ignore-space-at-eol > out -test_expect_failure 'another test, with -w --ignore-space-at-eol' 'test_cmp expect out' +test_expect_success 'another test, with -w --ignore-space-at-eol' 'test_cmp expect out' git diff -w -b --ignore-space-at-eol > out -test_expect_failure 'another test, with -w -b --ignore-space-at-eol' 'test_cmp expect out' +test_expect_success 'another test, with -w -b --ignore-space-at-eol' 'test_cmp expect out' tr 'Q' '\015' << EOF > expect diff --git a/x b/x @@ -123,7 +123,7 @@ EOF git diff -b > out test_expect_success 'another test, with -b' 'test_cmp expect out' git diff -b --ignore-space-at-eol > out -test_expect_failure 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out' +test_expect_success 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out' tr 'Q' '\015' << EOF > expect diff --git a/x b/x |