Merge branch 'kc/maint-diff-bwi-fix' into maint

* kc/maint-diff-bwi-fix:
Fix combined use of whitespace ignore options to diff
test more combinations of ignore-whitespace options to diff

diff --combined t/t4015-diff-whitespace.sh
index fc2307eaa3b4e8b1481fd7aa5ae0f93d085338af,5ed18806a783c8004f733e5571cfb1fc8b4dd698..6d13da30dad5a78fb17a01e86ef33072ea9e6250
--- 1/t/t4015-diff-whitespace.sh
--- 2/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@@ -7,7 -7,7 +7,7 @@@ test_description='Test special whitespa
  
  '
  . ./test-lib.sh
 -. ../diff-lib.sh
 +. "$TEST_DIRECTORY"/diff-lib.sh
  
  # Ray Lehtiniemi's example
  
@@@ -98,6 -98,12 +98,12 @@@ index d99af23..8b32fb5 10064
  EOF
  git diff -w > out
  test_expect_success 'another test, with -w' 'test_cmp expect out'
+ git diff -w -b > out
+ test_expect_success 'another test, with -w -b' 'test_cmp expect out'
+ git diff -w --ignore-space-at-eol > 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_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
@@@ -116,6 -122,27 +122,27 @@@ index d99af23..8b32fb5 10064
  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_success 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out'
+ 
+ tr 'Q' '\015' << EOF > expect
+ diff --git a/x b/x
+ index d99af23..8b32fb5 100644
+ --- a/x
+ +++ b/x
+ @@ -1,6 +1,6 @@
+ -whitespace at beginning
+ -whitespace change
+ -whitespace in the middle
+ +     whitespace at beginning
+ +whitespace    change
+ +white space in the middle
+  whitespace at end
+  unchanged line
+  CR at endQ
+ EOF
+ git diff --ignore-space-at-eol > out
+ test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect out'
  
  test_expect_success 'check mixed spaces and tabs in indent' '