diff options
| -rwxr-xr-x | t/t4101-apply-nonl.sh | 6 | ||||
| -rw-r--r-- | t/t4101/diff.0-1 | 6 | ||||
| -rw-r--r-- | t/t4101/diff.0-2 | 7 | ||||
| -rw-r--r-- | t/t4101/diff.0-3 | 8 | ||||
| -rw-r--r-- | t/t4101/diff.1-0 | 6 | ||||
| -rw-r--r-- | t/t4101/diff.1-2 | 8 | ||||
| -rw-r--r-- | t/t4101/diff.1-3 | 8 | ||||
| -rw-r--r-- | t/t4101/diff.2-0 | 7 | ||||
| -rw-r--r-- | t/t4101/diff.2-1 | 8 | ||||
| -rw-r--r-- | t/t4101/diff.2-3 | 7 | ||||
| -rw-r--r-- | t/t4101/diff.3-0 | 8 | ||||
| -rw-r--r-- | t/t4101/diff.3-1 | 8 | ||||
| -rw-r--r-- | t/t4101/diff.3-2 | 7 |
13 files changed, 89 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 diff --git a/t/t4101/diff.0-1 b/t/t4101/diff.0-1 new file mode 100644 index 000000000..1010a88f4 --- /dev/null +++ b/t/t4101/diff.0-1 @@ -0,0 +1,6 @@ +--- a/frotz ++++ b/frotz +@@ -1,2 +1,3 @@ + a + b ++c diff --git a/t/t4101/diff.0-2 b/t/t4101/diff.0-2 new file mode 100644 index 000000000..36460a243 --- /dev/null +++ b/t/t4101/diff.0-2 @@ -0,0 +1,7 @@ +--- a/frotz ++++ b/frotz +@@ -1,2 +1,2 @@ + a +-b ++b +\ No newline at end of file diff --git a/t/t4101/diff.0-3 b/t/t4101/diff.0-3 new file mode 100644 index 000000000..b281c43e5 --- /dev/null +++ b/t/t4101/diff.0-3 @@ -0,0 +1,8 @@ +--- a/frotz ++++ b/frotz +@@ -1,2 +1,3 @@ + a +-b ++c ++b +\ No newline at end of file diff --git a/t/t4101/diff.1-0 b/t/t4101/diff.1-0 new file mode 100644 index 000000000..f0a2e9277 --- /dev/null +++ b/t/t4101/diff.1-0 @@ -0,0 +1,6 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,2 @@ + a + b +-c diff --git a/t/t4101/diff.1-2 b/t/t4101/diff.1-2 new file mode 100644 index 000000000..2a440a5ce --- /dev/null +++ b/t/t4101/diff.1-2 @@ -0,0 +1,8 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,2 @@ + a +-b +-c ++b +\ No newline at end of file diff --git a/t/t4101/diff.1-3 b/t/t4101/diff.1-3 new file mode 100644 index 000000000..61aff975b --- /dev/null +++ b/t/t4101/diff.1-3 @@ -0,0 +1,8 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,3 @@ + a +-b + c ++b +\ No newline at end of file diff --git a/t/t4101/diff.2-0 b/t/t4101/diff.2-0 new file mode 100644 index 000000000..c2e71ee34 --- /dev/null +++ b/t/t4101/diff.2-0 @@ -0,0 +1,7 @@ +--- a/frotz ++++ b/frotz +@@ -1,2 +1,2 @@ + a +-b +\ No newline at end of file ++b diff --git a/t/t4101/diff.2-1 b/t/t4101/diff.2-1 new file mode 100644 index 000000000..a66d9fd3a --- /dev/null +++ b/t/t4101/diff.2-1 @@ -0,0 +1,8 @@ +--- a/frotz ++++ b/frotz +@@ -1,2 +1,3 @@ + a +-b +\ No newline at end of file ++b ++c diff --git a/t/t4101/diff.2-3 b/t/t4101/diff.2-3 new file mode 100644 index 000000000..5633c831d --- /dev/null +++ b/t/t4101/diff.2-3 @@ -0,0 +1,7 @@ +--- a/frotz ++++ b/frotz +@@ -1,2 +1,3 @@ + a ++c + b +\ No newline at end of file diff --git a/t/t4101/diff.3-0 b/t/t4101/diff.3-0 new file mode 100644 index 000000000..10b1a41ed --- /dev/null +++ b/t/t4101/diff.3-0 @@ -0,0 +1,8 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,2 @@ + a +-c +-b +\ No newline at end of file ++b diff --git a/t/t4101/diff.3-1 b/t/t4101/diff.3-1 new file mode 100644 index 000000000..c799c60fb --- /dev/null +++ b/t/t4101/diff.3-1 @@ -0,0 +1,8 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,3 @@ + a ++b + c +-b +\ No newline at end of file diff --git a/t/t4101/diff.3-2 b/t/t4101/diff.3-2 new file mode 100644 index 000000000..f8d1ba6dc --- /dev/null +++ b/t/t4101/diff.3-2 @@ -0,0 +1,7 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,2 @@ + a +-c + b +\ No newline at end of file |