Merge branch 'maint'

diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index dc538b3e33858623eff8a10d30a488194b58667d..83c54b747f4efe1f99b67284a7ba72b89df07a6d 100755 (executable)
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -121,7 +121,15 @@ test_expect_success 'check mixed spaces and tabs in indent' '
 
        # This is indented with SP HT SP.
        echo "   foo();" > x &&
-       git diff --check | grep "space before tab"
+       git diff --check | grep "space before tab 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"
 
 '
 
@@ -133,29 +141,29 @@ test_expect_success 'check with no whitespace errors' '
 
 '
 
-test_expect_failure 'check with trailing whitespace' '
+test_expect_success 'check with trailing whitespace' '
 
        echo "foo(); " > x &&
-       git diff --check
+       ! git diff --check
 
 '
 
-test_expect_failure 'check with space before tab in indent' '
+test_expect_success 'check with space before tab in indent' '
 
        # indent has space followed by hard tab
        echo "  foo();" > x &&
-       git diff --check
+       ! git diff --check
 
 '
 
-test_expect_failure '--check and --exit-code are exclusive' '
+test_expect_success '--check and --exit-code are not exclusive' '
 
        git checkout x &&
        git diff --check --exit-code
 
 '
 
-test_expect_failure '--check and --quiet are exclusive' '
+test_expect_success '--check and --quiet are not exclusive' '
 
        git diff --check --quiet
 
@@ -169,20 +177,20 @@ test_expect_success 'check staged with no whitespace errors' '
 
 '
 
-test_expect_failure 'check staged with trailing whitespace' '
+test_expect_success 'check staged with trailing whitespace' '
 
        echo "foo(); " > x &&
        git add x &&
-       git diff --cached --check
+       ! git diff --cached --check
 
 '
 
-test_expect_failure 'check staged with space before tab in indent' '
+test_expect_success 'check staged with space before tab in indent' '
 
        # indent has space followed by hard tab
        echo "  foo();" > x &&
        git add x &&
-       git diff --cached --check
+       ! git diff --cached --check
 
 '
 
@@ -194,20 +202,20 @@ test_expect_success 'check with no whitespace errors (diff-index)' '
 
 '
 
-test_expect_failure 'check with trailing whitespace (diff-index)' '
+test_expect_success 'check with trailing whitespace (diff-index)' '
 
        echo "foo(); " > x &&
        git add x &&
-       git diff-index --check HEAD
+       ! git diff-index --check HEAD
 
 '
 
-test_expect_failure 'check with space before tab in indent (diff-index)' '
+test_expect_success 'check with space before tab in indent (diff-index)' '
 
        # indent has space followed by hard tab
        echo "  foo();" > x &&
        git add x &&
-       git diff-index --check HEAD
+       ! git diff-index --check HEAD
 
 '
 
@@ -219,20 +227,20 @@ test_expect_success 'check staged with no whitespace errors (diff-index)' '
 
 '
 
-test_expect_failure 'check staged with trailing whitespace (diff-index)' '
+test_expect_success 'check staged with trailing whitespace (diff-index)' '
 
        echo "foo(); " > x &&
        git add x &&
-       git diff-index --cached --check HEAD
+       ! git diff-index --cached --check HEAD
 
 '
 
-test_expect_failure 'check staged with space before tab in indent (diff-index)' '
+test_expect_success 'check staged with space before tab in indent (diff-index)' '
 
        # indent has space followed by hard tab
        echo "  foo();" > x &&
        git add x &&
-       git diff-index --cached --check HEAD
+       ! git diff-index --cached --check HEAD
 
 '
 
@@ -244,20 +252,86 @@ test_expect_success 'check with no whitespace errors (diff-tree)' '
 
 '
 
-test_expect_failure 'check with trailing whitespace (diff-tree)' '
+test_expect_success 'check with trailing whitespace (diff-tree)' '
 
        echo "foo(); " > x &&
        git commit -m "another commit" x &&
-       git diff-tree --check HEAD^ HEAD
+       ! git diff-tree --check HEAD^ HEAD
 
 '
 
-test_expect_failure 'check with space before tab in indent (diff-tree)' '
+test_expect_success 'check with space before tab in indent (diff-tree)' '
 
        # indent has space followed by hard tab
        echo "  foo();" > x &&
        git commit -m "yet another" x &&
-       git diff-tree --check HEAD^ HEAD
+       ! git diff-tree --check HEAD^ HEAD
+
+'
+
+test_expect_success 'check trailing whitespace (trailing-space: off)' '
+
+       git config core.whitespace "-trailing-space" &&
+       echo "foo ();   " > x &&
+       git diff --check
+
+'
+
+test_expect_success 'check trailing whitespace (trailing-space: on)' '
+
+       git config core.whitespace "trailing-space" &&
+       echo "foo ();   " > x &&
+       ! git diff --check
+
+'
+
+test_expect_success 'check space before tab in indent (space-before-tab: off)' '
+
+       # indent contains space followed by HT
+       git config core.whitespace "-space-before-tab" &&
+       echo "  foo ();" > x &&
+       git diff --check
+
+'
+
+test_expect_success 'check space before tab in indent (space-before-tab: on)' '
+
+       # indent contains space followed by HT
+       git config core.whitespace "space-before-tab" &&
+       echo "  foo ();   " > x &&
+       ! git diff --check
+
+'
+
+test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' '
+
+       git config core.whitespace "-indent-with-non-tab"
+       echo "        foo ();" > x &&
+       git diff --check
+
+'
+
+test_expect_success 'check 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 '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:"
 
 '