From: Dennis Stosberg Date: Sat, 17 Jun 2006 15:02:45 +0000 (+0200) Subject: Make t4101-apply-nonl bring along its patches X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=f0338bbd820f45df51663342827e5aefc4550bf7;p=git.git Make t4101-apply-nonl bring along its patches Some versions of "diff" (e.g. on FreeBSD and older Linux systems) do not support the "\ No newline at end of file" remark and are not able to generate the patches needed for this test. This lets the test fail, although git-apply is working perfectly. This patch adds the pre-generated patches to t/t4100/ and makes the test use them. Signed-off-by: Dennis Stosberg Signed-off-by: Junio C Hamano --- diff --git a/t/t4101-apply-nonl.sh b/t/t4101-apply-nonl.sh index 26b131d0..026fac8c 100755 --- a/t/t4101-apply-nonl.sh +++ b/t/t4101-apply-nonl.sh @@ -20,14 +20,10 @@ do for j in 0 1 2 3 do test $i -eq $j && continue - diff -u frotz.$i frotz.$j | - sed -e ' - /^---/s|.*|--- a/frotz| - /^+++/s|.*|+++ b/frotz|' >diff.$i-$j cat frotz.$i >frotz test_expect_success \ "apply diff between $i and $j" \ - "git-apply