summaryrefslogtreecommitdiff
path: root/t/t4102-apply-rename.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-18 00:27:59 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-18 00:28:16 -0800
commit03f94ae9f909952ed5a78917ab319a312889354b (patch)
tree0fd041e8b390bd0d2a960ae629d8e965d363de92 /t/t4102-apply-rename.sh
parent2c47789d817aaf745a5ce5d5f79619c634cc8566 (diff)
parent81b50f3ce40bfdd66e5d967bf82be001039a9a98 (diff)
downloadgit-03f94ae9f909952ed5a78917ab319a312889354b.tar.gz
Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-init
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"'