From f0338bbd820f45df51663342827e5aefc4550bf7 Mon Sep 17 00:00:00 2001 From: Dennis Stosberg Date: Sat, 17 Jun 2006 17:02:45 +0200 Subject: [PATCH] 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 --- t/t4101-apply-nonl.sh | 6 +----- t/t4101/diff.0-1 | 6 ++++++ t/t4101/diff.0-2 | 7 +++++++ t/t4101/diff.0-3 | 8 ++++++++ t/t4101/diff.1-0 | 6 ++++++ t/t4101/diff.1-2 | 8 ++++++++ t/t4101/diff.1-3 | 8 ++++++++ t/t4101/diff.2-0 | 7 +++++++ t/t4101/diff.2-1 | 8 ++++++++ t/t4101/diff.2-3 | 7 +++++++ t/t4101/diff.3-0 | 8 ++++++++ t/t4101/diff.3-1 | 8 ++++++++ t/t4101/diff.3-2 | 7 +++++++ 13 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 t/t4101/diff.0-1 create mode 100644 t/t4101/diff.0-2 create mode 100644 t/t4101/diff.0-3 create mode 100644 t/t4101/diff.1-0 create mode 100644 t/t4101/diff.1-2 create mode 100644 t/t4101/diff.1-3 create mode 100644 t/t4101/diff.2-0 create mode 100644 t/t4101/diff.2-1 create mode 100644 t/t4101/diff.2-3 create mode 100644 t/t4101/diff.3-0 create mode 100644 t/t4101/diff.3-1 create mode 100644 t/t4101/diff.3-2 diff --git a/t/t4101-apply-nonl.sh b/t/t4101-apply-nonl.sh index 26b131d0d..026fac8c5 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