diff options
| author |  Keith Cascio <keith@CS.UCLA.EDU> | 2009-01-19 10:03:04 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-01-19 21:21:58 -0800 |
| commit | 6d12acefd5ac0cd688bcc77470bb1d73859cdab1 (patch) | |
| tree | 41dd08677ee6c17691ddf32daaa49ff406c55d19 /t | |
| parent | test more combinations of ignore-whitespace options to diff (diff) | |
| download | tgif-6d12acefd5ac0cd688bcc77470bb1d73859cdab1.tar.xz | |
Fix combined use of whitespace ignore options to diff
The code used to misbehave when options to ignore certain whitespaces
(-w -b and --ignore-at-eol) were combined.
Signed-off-by: Keith Cascio <keith@cs.ucla.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 0e35b6c711..5ed18806a7 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 |