Skip to content

Commit

Permalink
Make t4101-apply-nonl bring along its patches
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dennis Stosberg authored and Junio C Hamano committed Jun 17, 2006
1 parent 175fb6c commit f0338bb
Show file tree
Hide file tree
Showing 13 changed files with 89 additions and 5 deletions.
6 changes: 1 addition & 5 deletions t/t4101-apply-nonl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions t/t4101/diff.0-1
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
--- a/frotz
+++ b/frotz
@@ -1,2 +1,3 @@
a
b
+c
7 changes: 7 additions & 0 deletions t/t4101/diff.0-2
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
--- a/frotz
+++ b/frotz
@@ -1,2 +1,2 @@
a
-b
+b
\ No newline at end of file
8 changes: 8 additions & 0 deletions t/t4101/diff.0-3
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--- a/frotz
+++ b/frotz
@@ -1,2 +1,3 @@
a
-b
+c
+b
\ No newline at end of file
6 changes: 6 additions & 0 deletions t/t4101/diff.1-0
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
--- a/frotz
+++ b/frotz
@@ -1,3 +1,2 @@
a
b
-c
8 changes: 8 additions & 0 deletions t/t4101/diff.1-2
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--- a/frotz
+++ b/frotz
@@ -1,3 +1,2 @@
a
-b
-c
+b
\ No newline at end of file
8 changes: 8 additions & 0 deletions t/t4101/diff.1-3
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--- a/frotz
+++ b/frotz
@@ -1,3 +1,3 @@
a
-b
c
+b
\ No newline at end of file
7 changes: 7 additions & 0 deletions t/t4101/diff.2-0
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
--- a/frotz
+++ b/frotz
@@ -1,2 +1,2 @@
a
-b
\ No newline at end of file
+b
8 changes: 8 additions & 0 deletions t/t4101/diff.2-1
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--- a/frotz
+++ b/frotz
@@ -1,2 +1,3 @@
a
-b
\ No newline at end of file
+b
+c
7 changes: 7 additions & 0 deletions t/t4101/diff.2-3
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
--- a/frotz
+++ b/frotz
@@ -1,2 +1,3 @@
a
+c
b
\ No newline at end of file
8 changes: 8 additions & 0 deletions t/t4101/diff.3-0
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--- a/frotz
+++ b/frotz
@@ -1,3 +1,2 @@
a
-c
-b
\ No newline at end of file
+b
8 changes: 8 additions & 0 deletions t/t4101/diff.3-1
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--- a/frotz
+++ b/frotz
@@ -1,3 +1,3 @@
a
+b
c
-b
\ No newline at end of file
7 changes: 7 additions & 0 deletions t/t4101/diff.3-2
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
--- a/frotz
+++ b/frotz
@@ -1,3 +1,2 @@
a
-c
b
\ No newline at end of file

0 comments on commit f0338bb

Please sign in to comment.