diff options
| author | Dennis Stosberg <dennis@stosberg.net> | 2006-06-17 17:02:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-17 16:06:21 -0700 |
| commit | f0338bbd820f45df51663342827e5aefc4550bf7 (patch) | |
| tree | b519aaf39b15c091521c060513fe0e396eacf8ea /t/t4101-apply-nonl.sh | |
| parent | 175fb6c0406e63a10791ab793cdac2acf185eab0 (diff) | |
| download | git-f0338bbd820f45df51663342827e5aefc4550bf7.tar.gz git-f0338bbd820f45df51663342827e5aefc4550bf7.tar.xz | |
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 <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4101-apply-nonl.sh')
| -rwxr-xr-x | t/t4101-apply-nonl.sh | 6 |
1 files changed, 1 insertions, 5 deletions
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 <diff.$i-$j && diff frotz.$j frotz" + "git-apply <../t4101/diff.$i-$j && diff frotz.$j frotz" done done |