X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4102-apply-rename.sh;h=d42abff1ad59343fa1c84bded9a82c3212370da0;hb=be4d2c83b68a96285cc05036add4d64d324e52d9;hp=b4662b03647bd2f36c07ffac24adc6b5df5eef76;hpb=d77ee72662a821d66ae218056f0103eb24d8d4b4;p=git.git diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh index b4662b036..d42abff1a 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,10 +26,10 @@ 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 @@ -40,7 +40,7 @@ else 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 +56,7 @@ copy to bar EOF test_expect_success 'apply copy' \ - 'git-apply --index --stat --summary --apply test-patch && + 'git apply --index --stat --summary --apply test-patch && test "$(cat bar)" = "This is bar" -a "$(cat foo)" = "This is foo"' test_done