diff options
Diffstat (limited to 't/t4102-apply-rename.sh')
| -rwxr-xr-x | t/t4102-apply-rename.sh | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh index fbb508d389..e3ea3d5114 100755 --- a/t/t4102-apply-rename.sh +++ b/t/t4102-apply-rename.sh @@ -3,18 +3,19 @@ # 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 +. "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh # setup 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,17 +27,32 @@ 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 [ "$(git repo-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 && + 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 'apply copy' \ + 'git apply --index --stat --summary --apply test-patch && + test "$(cat bar)" = "This is bar" -a "$(cat foo)" = "This is foo"' test_done |