Merge branch 'nd/maint-hide-checkout-index-from-error' into maint

diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
index adfcbb5a3b9a6ec7e77f45141c2753cb79ed3763..0d36ebdc8653d7d22ab5831c1f154db452e4558e 100755 (executable)
--- a/t/t4129-apply-samemode.sh
+++ b/t/t4129-apply-samemode.sh
@@ -3,6 +3,7 @@
 test_description='applying patch with mode bits'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh
 
 test_expect_success setup '
        echo original >file &&
@@ -16,14 +17,14 @@ test_expect_success setup '
        git diff --stat -p >patch-1.txt
 '
 
-test_expect_success 'same mode (no index)' '
+test_expect_success FILEMODE 'same mode (no index)' '
        git reset --hard &&
        chmod +x file &&
        git apply patch-0.txt &&
        test -x file
 '
 
-test_expect_success 'same mode (with index)' '
+test_expect_success FILEMODE 'same mode (with index)' '
        git reset --hard &&
        chmod +x file &&
        git add file &&
@@ -32,7 +33,7 @@ test_expect_success 'same mode (with index)' '
        git diff --exit-code
 '
 
-test_expect_success 'same mode (index only)' '
+test_expect_success FILEMODE 'same mode (index only)' '
        git reset --hard &&
        chmod +x file &&
        git add file &&
@@ -40,20 +41,20 @@ test_expect_success 'same mode (index only)' '
        git ls-files -s file | grep "^100755"
 '
 
-test_expect_success 'mode update (no index)' '
+test_expect_success FILEMODE 'mode update (no index)' '
        git reset --hard &&
        git apply patch-1.txt &&
        test -x file
 '
 
-test_expect_success 'mode update (with index)' '
+test_expect_success FILEMODE 'mode update (with index)' '
        git reset --hard &&
        git apply --index patch-1.txt &&
        test -x file &&
        git diff --exit-code
 '
 
-test_expect_success 'mode update (index only)' '
+test_expect_success FILEMODE 'mode update (index only)' '
        git reset --hard &&
        git apply --cached patch-1.txt &&
        git ls-files -s file | grep "^100755"