Merge branch 'maint'

diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh
index 530cc4d2a38c6f4af92097dfe524029ef6a3a6bf..1597965241c3566aa3a14e986fd5a630fb348479 100755 (executable)
--- a/t/t4102-apply-rename.sh
+++ b/t/t4102-apply-rename.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-apply handling copy/rename patch.
+test_description='git apply handling copy/rename patch.
 
 '
 . ./test-lib.sh
@@ -13,8 +13,8 @@ test_description='git-apply handling copy/rename patch.
 cat >test-patch <<\EOF
 diff --git a/foo b/bar
 similarity index 47%
-copy from foo
-copy to bar
+rename from foo
+rename to bar
 --- a/foo
 +++ b/bar
 @@ -1 +1 @@
@@ -26,12 +26,39 @@ echo 'This is foo' >foo
 chmod +x foo
 
 test_expect_success setup \
-    'git-update-index --add foo'
+    'git update-index --add foo'
 
 test_expect_success apply \
-    'git-apply --index --stat --summary --apply test-patch'
+    'git apply --index --stat --summary --apply test-patch'
+
+if test "$(git config --bool core.filemode)" = false
+then
+       say 'filemode disabled on the filesystem'
+else
+       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"'
+
+cat >test-patch <<\EOF
+diff --git a/foo b/bar
+similarity index 47%
+copy from foo
+copy to bar
+--- a/foo
++++ b/bar
+@@ -1 +1 @@
+-This is foo
++This is bar
+EOF
 
-test_expect_success validate \
-    'test -f bar && ls -l bar | grep "^-..x..x..x"'
+test_expect_success 'apply copy' \
+    'git apply --index --stat --summary --apply test-patch &&
+     test "$(cat bar)" = "This is bar" -a "$(cat foo)" = "This is foo"'
 
 test_done