t3404 (rebase -i): introduce helper to check position of HEAD

diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh
index d42abff1ad59343fa1c84bded9a82c3212370da0..e3ea3d5114b8f6a09b79c9a1323c563da0c7b170 100755 (executable)
--- a/t/t4102-apply-rename.sh
+++ b/t/t4102-apply-rename.sh
@@ -7,6 +7,7 @@ test_description='git apply handling copy/rename patch.
 
 '
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh
 
 # setup
 
@@ -31,13 +32,8 @@ test_expect_success setup \
 test_expect_success apply \
     'git apply --index --stat --summary --apply test-patch'
 
-if [ "$(git config --get core.filemode)" = false ]
-then
-       say 'filemode disabled on the filesystem'
-else
-       test_expect_success validate \
+test_expect_success FILEMODE validate \
            'test -f bar && ls -l bar | grep "^-..x......"'
-fi
 
 test_expect_success 'apply reverse' \
     'git apply -R --index --stat --summary --apply test-patch &&