Merge branch 'bd/qsort'

diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 9bff8f5e4bae6beb22ba31e8be03a0528e06519e..83c54b747f4efe1f99b67284a7ba72b89df07a6d 100755 (executable)
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -125,6 +125,14 @@ test_expect_success 'check mixed spaces and tabs in indent' '
 
 '
 
+test_expect_success 'check mixed tabs and spaces in indent' '
+
+       # This is indented with HT SP HT.
+       echo "          foo();" > x &&
+       git diff --check | grep "space before tab in indent"
+
+'
+
 test_expect_success 'check with no whitespace errors' '
 
        git commit -m "snapshot" &&
@@ -298,7 +306,7 @@ test_expect_success 'check space before tab in indent (space-before-tab: on)' '
 test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' '
 
        git config core.whitespace "-indent-with-non-tab"
-       echo "                foo ();" > x &&
+       echo "        foo ();" > x &&
        git diff --check
 
 '
@@ -306,9 +314,25 @@ test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' '
 test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' '
 
        git config core.whitespace "indent-with-non-tab" &&
-       echo "                foo ();" > x &&
+       echo "        foo ();" > x &&
        ! git diff --check
 
 '
 
+test_expect_success 'check tabs and spaces as indentation (indent-with-non-tab: on)' '
+
+       git config core.whitespace "indent-with-non-tab" &&
+       echo "                  foo ();" > x &&
+       ! git diff --check
+
+'
+
+test_expect_success 'line numbers in --check output are correct' '
+
+       echo "" > x &&
+       echo "foo(); " >> x &&
+       git diff --check | grep "x:2:"
+
+'
+
 test_done