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>
This commit is contained in:
Dennis Stosberg 2006-06-17 17:02:45 +02:00 committed by Junio C Hamano
parent 175fb6c040
commit f0338bbd82
13 changed files with 89 additions and 5 deletions

View file

@ -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

6
t/t4101/diff.0-1 Normal file
View file

@ -0,0 +1,6 @@
--- a/frotz
+++ b/frotz
@@ -1,2 +1,3 @@
a
b
+c

7
t/t4101/diff.0-2 Normal file
View file

@ -0,0 +1,7 @@
--- a/frotz
+++ b/frotz
@@ -1,2 +1,2 @@
a
-b
+b
\ No newline at end of file

8
t/t4101/diff.0-3 Normal file
View file

@ -0,0 +1,8 @@
--- a/frotz
+++ b/frotz
@@ -1,2 +1,3 @@
a
-b
+c
+b
\ No newline at end of file

6
t/t4101/diff.1-0 Normal file
View file

@ -0,0 +1,6 @@
--- a/frotz
+++ b/frotz
@@ -1,3 +1,2 @@
a
b
-c

8
t/t4101/diff.1-2 Normal file
View file

@ -0,0 +1,8 @@
--- a/frotz
+++ b/frotz
@@ -1,3 +1,2 @@
a
-b
-c
+b
\ No newline at end of file

8
t/t4101/diff.1-3 Normal file
View file

@ -0,0 +1,8 @@
--- a/frotz
+++ b/frotz
@@ -1,3 +1,3 @@
a
-b
c
+b
\ No newline at end of file

7
t/t4101/diff.2-0 Normal file
View file

@ -0,0 +1,7 @@
--- a/frotz
+++ b/frotz
@@ -1,2 +1,2 @@
a
-b
\ No newline at end of file
+b

8
t/t4101/diff.2-1 Normal file
View file

@ -0,0 +1,8 @@
--- a/frotz
+++ b/frotz
@@ -1,2 +1,3 @@
a
-b
\ No newline at end of file
+b
+c

7
t/t4101/diff.2-3 Normal file
View file

@ -0,0 +1,7 @@
--- a/frotz
+++ b/frotz
@@ -1,2 +1,3 @@
a
+c
b
\ No newline at end of file

8
t/t4101/diff.3-0 Normal file
View file

@ -0,0 +1,8 @@
--- a/frotz
+++ b/frotz
@@ -1,3 +1,2 @@
a
-c
-b
\ No newline at end of file
+b

8
t/t4101/diff.3-1 Normal file
View file

@ -0,0 +1,8 @@
--- a/frotz
+++ b/frotz
@@ -1,3 +1,3 @@
a
+b
c
-b
\ No newline at end of file

7
t/t4101/diff.3-2 Normal file
View file

@ -0,0 +1,7 @@
--- a/frotz
+++ b/frotz
@@ -1,3 +1,2 @@
a
-c
b
\ No newline at end of file