Merge branch 'jn/maint-gitweb-pathinfo-fix'

diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index a8736f7cbeef65b3454847bb4b4df508c0079652..9059bcd69eec7a718b6017356c82ec163875c042 100755 (executable)
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -330,7 +330,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"
+       git config core.whitespace "-indent-with-non-tab" &&
        echo "        foo ();" > x &&
        git diff --check
 
@@ -344,6 +344,13 @@ test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' '
 
 '
 
+test_expect_success 'ditto, but tabwidth=9' '
+
+       git config core.whitespace "indent-with-non-tab,tabwidth=9" &&
+       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" &&
@@ -352,6 +359,20 @@ test_expect_success 'check tabs and spaces as indentation (indent-with-non-tab:
 
 '
 
+test_expect_success 'ditto, but tabwidth=10' '
+
+       git config core.whitespace "indent-with-non-tab,tabwidth=10" &&
+       test_must_fail git diff --check
+
+'
+
+test_expect_success 'ditto, but tabwidth=20' '
+
+       git config core.whitespace "indent-with-non-tab,tabwidth=20" &&
+       git diff --check
+
+'
+
 test_expect_success 'check tabs as indentation (tab-in-indent: off)' '
 
        git config core.whitespace "-tab-in-indent" &&
@@ -376,6 +397,13 @@ test_expect_success 'check tabs and spaces as indentation (tab-in-indent: on)' '
 
 '
 
+test_expect_success 'ditto, but tabwidth=1 (must be irrelevant)' '
+
+       git config core.whitespace "tab-in-indent,tabwidth=1" &&
+       test_must_fail git diff --check
+
+'
+
 test_expect_success 'check tab-in-indent and indent-with-non-tab conflict' '
 
        git config core.whitespace "tab-in-indent,indent-with-non-tab" &&