X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4112-apply-renames.sh;h=70a1859503c7ee6a5b1a6db19174c1c359eec13f;hb=04f32cf1b31717bf0b7cbbc00783a4107cc19cfd;hp=9baf810beeb513e5a86b822c5a23354e948ef5c4;hpb=9bfe9f80b1f57dd5bd63c94516fb8aa820fef1cd;p=git.git diff --git a/t/t4112-apply-renames.sh b/t/t4112-apply-renames.sh index 9baf810be..70a185950 100755 --- a/t/t4112-apply-renames.sh +++ b/t/t4112-apply-renames.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Junio C Hamano # -test_description='git-apply should not get confused with rename/copy. +test_description='git apply should not get confused with rename/copy. ' @@ -115,10 +115,10 @@ rename to include/arch/m32r/klibc/archsetjmp.h +#endif /* _KLIBC_ARCHSETJMP_H */ EOF -find klibc -type f -print | xargs git-update-index --add -- +find klibc -type f -print | xargs git update-index --add -- -test_expect_success 'check rename/copy patch' 'git-apply --check patch' +test_expect_success 'check rename/copy patch' 'git apply --check patch' -test_expect_success 'apply rename/copy patch' 'git-apply --index patch' +test_expect_success 'apply rename/copy patch' 'git apply --index patch' test_done