diff options
Diffstat (limited to 't/t4102-apply-rename.sh')
| -rwxr-xr-x | t/t4102-apply-rename.sh | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh index b4662b0364..fae305979a 100755 --- 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 @@ -26,21 +26,16 @@ 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 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 && + 'git apply -R --index --stat --summary --apply test-patch && test "$(cat foo)" = "This is foo"' cat >test-patch <<\EOF @@ -56,7 +51,7 @@ copy to 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"' + 'git apply --index --stat --summary --apply test-patch && + test "$(cat bar)" = "This is bar" && test "$(cat foo)" = "This is foo"' test_done |