@matheusbsbs / matheus-bagliano / commits / f0338bbd82
Fork 0

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>

Dennis Stosberg committed Jun 17, 2006 at 17:02 UTC f0338bbd820f45df51663342827e5aefc4550bf7
13 files changed +89 -5
t/t4101-apply-nonl.sh
+1 -5
@@ -20,14 +20,10 @@ do
20 for j in 0 1 2 3
21 do
22 test $i -eq $j && continue
23 - diff -u frotz.$i frotz.$j |
24 - sed -e '
25 - /^---/s|.*|--- a/frotz|
26 - /^+++/s|.*|+++ b/frotz|' >diff.$i-$j
23 cat frotz.$i >frotz
24 test_expect_success \
25 "apply diff between $i and $j" \
30 - "git-apply <diff.$i-$j && diff frotz.$j frotz"
26 + "git-apply <../t4101/diff.$i-$j && diff frotz.$j frotz"
27 done
28 done
29
t/t4101/diff.0-1 new
+6
@@ -0,0 +1,6 @@
1 +--- a/frotz
2 ++++ b/frotz
3 +@@ -1,2 +1,3 @@
4 + a
5 + b
6 ++c
t/t4101/diff.0-2 new
+7
@@ -0,0 +1,7 @@
1 +--- a/frotz
2 ++++ b/frotz
3 +@@ -1,2 +1,2 @@
4 + a
5 +-b
6 ++b
7 +\ No newline at end of file
t/t4101/diff.0-3 new
+8
@@ -0,0 +1,8 @@
1 +--- a/frotz
2 ++++ b/frotz
3 +@@ -1,2 +1,3 @@
4 + a
5 +-b
6 ++c
7 ++b
8 +\ No newline at end of file
t/t4101/diff.1-0 new
+6
@@ -0,0 +1,6 @@
1 +--- a/frotz
2 ++++ b/frotz
3 +@@ -1,3 +1,2 @@
4 + a
5 + b
6 +-c
t/t4101/diff.1-2 new
+8
@@ -0,0 +1,8 @@
1 +--- a/frotz
2 ++++ b/frotz
3 +@@ -1,3 +1,2 @@
4 + a
5 +-b
6 +-c
7 ++b
8 +\ No newline at end of file
t/t4101/diff.1-3 new
+8
@@ -0,0 +1,8 @@
1 +--- a/frotz
2 ++++ b/frotz
3 +@@ -1,3 +1,3 @@
4 + a
5 +-b
6 + c
7 ++b
8 +\ No newline at end of file
t/t4101/diff.2-0 new
+7
@@ -0,0 +1,7 @@
1 +--- a/frotz
2 ++++ b/frotz
3 +@@ -1,2 +1,2 @@
4 + a
5 +-b
6 +\ No newline at end of file
7 ++b
t/t4101/diff.2-1 new
+8
@@ -0,0 +1,8 @@
1 +--- a/frotz
2 ++++ b/frotz
3 +@@ -1,2 +1,3 @@
4 + a
5 +-b
6 +\ No newline at end of file
7 ++b
8 ++c
t/t4101/diff.2-3 new
+7
@@ -0,0 +1,7 @@
1 +--- a/frotz
2 ++++ b/frotz
3 +@@ -1,2 +1,3 @@
4 + a
5 ++c
6 + b
7 +\ No newline at end of file
t/t4101/diff.3-0 new
+8
@@ -0,0 +1,8 @@
1 +--- a/frotz
2 ++++ b/frotz
3 +@@ -1,3 +1,2 @@
4 + a
5 +-c
6 +-b
7 +\ No newline at end of file
8 ++b
t/t4101/diff.3-1 new
+8
@@ -0,0 +1,8 @@
1 +--- a/frotz
2 ++++ b/frotz
3 +@@ -1,3 +1,3 @@
4 + a
5 ++b
6 + c
7 +-b
8 +\ No newline at end of file
t/t4101/diff.3-2 new
+7
@@ -0,0 +1,7 @@
1 +--- a/frotz
2 ++++ b/frotz
3 +@@ -1,3 +1,2 @@
4 + a
5 +-c
6 + b
7 +\ No newline at end of file