X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4117-apply-reject.sh;h=91931f0e3fde4874c865aa8dd44615b415d324ee;hb=542e165cdc4fbebbfe7c8954ca1aa1d4162e38cb;hp=b4de075a3e5df86fe399f9133f7437c4a8d8e26d;hpb=b32d37a3a6817ba307062fe2f7b6d9cfb85a1ebd;p=git.git diff --git a/t/t4117-apply-reject.sh b/t/t4117-apply-reject.sh index b4de075a3..91931f0e3 100755 --- a/t/t4117-apply-reject.sh +++ b/t/t4117-apply-reject.sh @@ -54,7 +54,7 @@ test_expect_success 'apply without --reject should fail' ' exit 1 fi - diff -u file1 saved.file1 + git diff file1 saved.file1 ' test_expect_success 'apply without --reject should fail' ' @@ -65,7 +65,7 @@ test_expect_success 'apply without --reject should fail' ' exit 1 fi - diff -u file1 saved.file1 + git diff file1 saved.file1 ' test_expect_success 'apply with --reject should fail but update the file' ' @@ -79,7 +79,7 @@ test_expect_success 'apply with --reject should fail but update the file' ' exit 1 fi - diff -u file1 expected && + git diff file1 expected && cat file1.rej && @@ -105,7 +105,7 @@ test_expect_success 'apply with --reject should fail but update the file' ' echo "file1 still exists?" exit 1 } - diff -u file2 expected && + git diff file2 expected && cat file2.rej && @@ -132,7 +132,7 @@ test_expect_success 'the same test with --verbose' ' echo "file1 still exists?" exit 1 } - diff -u file2 expected && + git diff file2 expected && cat file2.rej && @@ -151,7 +151,7 @@ test_expect_success 'apply cleanly with --verbose' ' git apply --verbose patch.1 && - diff -u file1 clean + git diff file1 clean ' test_done