X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4100-apply-stat.sh;h=c23341feb55e2404533b94fdf627de13c01b4ada;hb=438d2991eaa17549df67929cd4558d65840c37d7;hp=6579f06b05c91f00f4f45015894f2bfab1076bf6;hpb=0e84fb06a1022f99c96cfcd728e7bf029ef0b5e3;p=git.git diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh index 6579f06b0..8073a5a1f 100755 --- a/t/t4100-apply-stat.sh +++ b/t/t4100-apply-stat.sh @@ -3,45 +3,44 @@ # Copyright (c) 2005 Junio C Hamano # -test_description='git-apply --stat --summary test. +test_description='git apply --stat --summary test. ' . ./test-lib.sh test_expect_success \ 'rename' \ - 'git-apply --stat --summary <../t4100/t-apply-1.patch >current && - diff -u ../t4100/t-apply-1.expect current' + 'git apply --stat --summary <../t4100/t-apply-1.patch >current && + test_cmp ../t4100/t-apply-1.expect current' test_expect_success \ 'copy' \ - 'git-apply --stat --summary <../t4100/t-apply-2.patch >current && - diff -u ../t4100/t-apply-2.expect current' + 'git apply --stat --summary <../t4100/t-apply-2.patch >current && + test_cmp ../t4100/t-apply-2.expect current' test_expect_success \ 'rewrite' \ - 'git-apply --stat --summary <../t4100/t-apply-3.patch >current && - diff -u ../t4100/t-apply-3.expect current' + 'git apply --stat --summary <../t4100/t-apply-3.patch >current && + test_cmp ../t4100/t-apply-3.expect current' test_expect_success \ 'mode' \ - 'git-apply --stat --summary <../t4100/t-apply-4.patch >current && - diff -u ../t4100/t-apply-4.expect current' + 'git apply --stat --summary <../t4100/t-apply-4.patch >current && + test_cmp ../t4100/t-apply-4.expect current' test_expect_success \ 'non git' \ - 'git-apply --stat --summary <../t4100/t-apply-5.patch >current && - diff -u ../t4100/t-apply-5.expect current' + 'git apply --stat --summary <../t4100/t-apply-5.patch >current && + test_cmp ../t4100/t-apply-5.expect current' test_expect_success \ 'non git' \ - 'git-apply --stat --summary <../t4100/t-apply-6.patch >current && - diff -u ../t4100/t-apply-6.expect current' + 'git apply --stat --summary <../t4100/t-apply-6.patch >current && + test_cmp ../t4100/t-apply-6.expect current' test_expect_success \ 'non git' \ - 'git-apply --stat --summary <../t4100/t-apply-7.patch >current && - diff -u ../t4100/t-apply-7.expect current' + 'git apply --stat --summary <../t4100/t-apply-7.patch >current && + test_cmp ../t4100/t-apply-7.expect current' test_done -