summaryrefslogtreecommitdiff
path: root/t/t4102-apply-rename.sh
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2009-02-27 22:20:57 +0100
committerJohannes Sixt <j6t@kdbg.org>2009-03-22 17:26:44 +0100
commit872f349e7b119fcef7306f5dd7e4492ee3598318 (patch)
tree9e9ae49455befd3ac15a2d80079d8d494c86f10f /t/t4102-apply-rename.sh
parent56e78bfb299207213ff170238c34a1dc8fa67c09 (diff)
downloadgit-872f349e7b119fcef7306f5dd7e4492ee3598318.tar.gz
Skip tests that fail if the executable bit is not handled by the filesystem
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Diffstat (limited to 't/t4102-apply-rename.sh')
-rwxr-xr-xt/t4102-apply-rename.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh
index d42abff1ad..1597965241 100755
--- a/t/t4102-apply-rename.sh
+++ b/t/t4102-apply-rename.sh
@@ -31,14 +31,16 @@ test_expect_success setup \
test_expect_success apply \
'git apply --index --stat --summary --apply test-patch'
-if [ "$(git config --get core.filemode)" = false ]
+if test "$(git config --bool core.filemode)" = false
then
say 'filemode disabled on the filesystem'
else
- test_expect_success validate \
- 'test -f bar && ls -l bar | grep "^-..x......"'
+ test_set_prereq FILEMODE
fi
+test_expect_success FILEMODE validate \
+ 'test -f bar && ls -l bar | grep "^-..x......"'
+
test_expect_success 'apply reverse' \
'git apply -R --index --stat --summary --apply test-patch &&
test "$(cat foo)" = "This is foo"'