about summary refs log tree commit diff
path: root/third_party/git/t/t4252
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/t/t4252')
-rw-r--r--third_party/git/t/t4252/am-test-1-119
-rw-r--r--third_party/git/t/t4252/am-test-1-221
-rw-r--r--third_party/git/t/t4252/am-test-2-119
-rw-r--r--third_party/git/t/t4252/am-test-2-221
-rw-r--r--third_party/git/t/t4252/am-test-3-119
-rw-r--r--third_party/git/t/t4252/am-test-3-221
-rw-r--r--third_party/git/t/t4252/am-test-4-119
-rw-r--r--third_party/git/t/t4252/am-test-4-222
-rw-r--r--third_party/git/t/t4252/am-test-5-120
-rw-r--r--third_party/git/t/t4252/am-test-5-215
-rw-r--r--third_party/git/t/t4252/am-test-6-121
-rw-r--r--third_party/git/t/t4252/file-1-07
-rw-r--r--third_party/git/t/t4252/file-2-07
13 files changed, 0 insertions, 231 deletions
diff --git a/third_party/git/t/t4252/am-test-1-1 b/third_party/git/t/t4252/am-test-1-1
deleted file mode 100644
index b0c09dc965..0000000000
--- a/third_party/git/t/t4252/am-test-1-1
+++ /dev/null
@@ -1,19 +0,0 @@
-From: A U Thor <au.thor@example.com>
-Date: Thu Dec 4 16:00:00 2008 -0800
-Subject: Three
-
-Application of this should be rejected because the first line in the
-context does not match.
-
-diff --git i/file-1 w/file-1
-index 06e567b..10f8342 100644
---- i/file-1
-+++ w/file-1
-@@ -1,6 +1,6 @@
- One
- 2
--3
-+Three 
- 4
- 5
- 6
diff --git a/third_party/git/t/t4252/am-test-1-2 b/third_party/git/t/t4252/am-test-1-2
deleted file mode 100644
index 1b874ae115..0000000000
--- a/third_party/git/t/t4252/am-test-1-2
+++ /dev/null
@@ -1,21 +0,0 @@
-From: A U Thor <au.thor@example.com>
-Date: Thu Dec 4 16:00:00 2008 -0800
-Subject: Six
-
-Applying this patch with --whitespace=fix should lose 
-the trailing whitespace after "Six".
-
-diff --git i/file-2 w/file-2
-index 06e567b..b6f3a16 100644
---- i/file-2
-+++ w/file-2
-@@ -1,7 +1,7 @@
- 1
- 2
--3
-+Three
- 4
- 5
--6
-+Six 
- 7
diff --git a/third_party/git/t/t4252/am-test-2-1 b/third_party/git/t/t4252/am-test-2-1
deleted file mode 100644
index feda94a0cc..0000000000
--- a/third_party/git/t/t4252/am-test-2-1
+++ /dev/null
@@ -1,19 +0,0 @@
-From: A U Thor <au.thor@example.com>
-Date: Thu Dec 4 16:00:00 2008 -0800
-Subject: Three
-
-Application of this should be rejected even with -C1 because the
-preimage line in the context does not match.
-
-diff --git i/file-1 w/file-1
-index 06e567b..10f8342 100644
---- i/file-1
-+++ w/file-1
-@@ -1,6 +1,6 @@
- 1
- 2
--Tres
-+Three 
- 4
- 5
- 6
diff --git a/third_party/git/t/t4252/am-test-2-2 b/third_party/git/t/t4252/am-test-2-2
deleted file mode 100644
index 2ac6600976..0000000000
--- a/third_party/git/t/t4252/am-test-2-2
+++ /dev/null
@@ -1,21 +0,0 @@
-From: A U Thor <au.thor@example.com>
-Date: Thu Dec 4 16:00:00 2008 -0800
-Subject: Six
-
-Applying this patch with -C1 should be successful even though 
-the first line in the context does not match.
-
-diff --git i/file-2 w/file-2
-index 06e567b..b6f3a16 100644
---- i/file-2
-+++ w/file-2
-@@ -1,7 +1,7 @@
- One
- 2
--3
-+Three
- 4
- 5
--6
-+Six
- 7
diff --git a/third_party/git/t/t4252/am-test-3-1 b/third_party/git/t/t4252/am-test-3-1
deleted file mode 100644
index 608e5abba4..0000000000
--- a/third_party/git/t/t4252/am-test-3-1
+++ /dev/null
@@ -1,19 +0,0 @@
-From: A U Thor <au.thor@example.com>
-Date: Thu Dec 4 16:00:00 2008 -0800
-Subject: Three
-
-Application of this should be rejected even with -p2 because the
-preimage line in the context does not match.
-
-diff --git i/junk/file-1 w/junk/file-1
-index 06e567b..10f8342 100644
---- i/junk/file-1
-+++ w/junk/file-1
-@@ -1,6 +1,6 @@
- 1
- 2
--Tres
-+Three 
- 4
- 5
- 6
diff --git a/third_party/git/t/t4252/am-test-3-2 b/third_party/git/t/t4252/am-test-3-2
deleted file mode 100644
index 0081b96f2a..0000000000
--- a/third_party/git/t/t4252/am-test-3-2
+++ /dev/null
@@ -1,21 +0,0 @@
-From: A U Thor <au.thor@example.com>
-Date: Thu Dec 4 16:00:00 2008 -0800
-Subject: Six
-
-Applying this patch with -p2 should be successful even though
-the patch is against a wrong level.
-
-diff --git i/junk/file-2 w/junk/file-2
-index 06e567b..b6f3a16 100644
---- i/junk/file-2
-+++ w/junk/file-2
-@@ -1,7 +1,7 @@
- 1
- 2
--3
-+Three
- 4
- 5
--6
-+Six
- 7
diff --git a/third_party/git/t/t4252/am-test-4-1 b/third_party/git/t/t4252/am-test-4-1
deleted file mode 100644
index e48cd6cbde..0000000000
--- a/third_party/git/t/t4252/am-test-4-1
+++ /dev/null
@@ -1,19 +0,0 @@
-From: A U Thor <au.thor@example.com>
-Date: Thu Dec 4 16:00:00 2008 -0800
-Subject: Three
-
-Application of this should be rejected even with -C1 -p2 because
-the preimage line in the context does not match.
-
-diff --git i/junk/file-1 w/junk/file-1
-index 06e567b..10f8342 100644
---- i/junk/file-1
-+++ w/junk/file-1
-@@ -1,6 +1,6 @@
- 1
- 2
--Tres
-+Three 
- 4
- 5
- 6
diff --git a/third_party/git/t/t4252/am-test-4-2 b/third_party/git/t/t4252/am-test-4-2
deleted file mode 100644
index 0e69bfa55b..0000000000
--- a/third_party/git/t/t4252/am-test-4-2
+++ /dev/null
@@ -1,22 +0,0 @@
-From: A U Thor <au.thor@example.com>
-Date: Thu Dec 4 16:00:00 2008 -0800
-Subject: Six
-
-Applying this patch with -C1 -p2 should be successful even though
-the patch is against a wrong level and the first context line does
-not match.
-
-diff --git i/junk/file-2 w/junk/file-2
-index 06e567b..b6f3a16 100644
---- i/junk/file-2
-+++ w/junk/file-2
-@@ -1,7 +1,7 @@
- One
- 2
--3
-+Three
- 4
- 5
--6
-+Six
- 7
diff --git a/third_party/git/t/t4252/am-test-5-1 b/third_party/git/t/t4252/am-test-5-1
deleted file mode 100644
index da7bf29cbe..0000000000
--- a/third_party/git/t/t4252/am-test-5-1
+++ /dev/null
@@ -1,20 +0,0 @@
-From: A U Thor <au.thor@example.com>
-Date: Thu Dec 4 16:00:00 2008 -0800
-Subject: Six
-
-Applying this patch with --directory='frotz nitfol' should fail
-
-diff --git i/junk/file-2 w/junk/file-2
-index 06e567b..b6f3a16 100644
---- i/junk/file-2
-+++ w/junk/file-2
-@@ -1,7 +1,7 @@
- One
- 2
--3
-+Three
- 4
- 5
--6
-+Six
- 7
diff --git a/third_party/git/t/t4252/am-test-5-2 b/third_party/git/t/t4252/am-test-5-2
deleted file mode 100644
index 373025bcf6..0000000000
--- a/third_party/git/t/t4252/am-test-5-2
+++ /dev/null
@@ -1,15 +0,0 @@
-From: A U Thor <au.thor@example.com>
-Date: Thu Dec 4 16:00:00 2008 -0800
-Subject: Six
-
-Applying this patch with --directory='frotz nitfol' should succeed
-
-diff --git i/file-5 w/file-5
-new file mode 100644
-index 000000..1d6ed9f
---- /dev/null
-+++ w/file-5
-@@ -0,0 +1,3 @@
-+One
-+two
-+three
diff --git a/third_party/git/t/t4252/am-test-6-1 b/third_party/git/t/t4252/am-test-6-1
deleted file mode 100644
index a8859e9b8f..0000000000
--- a/third_party/git/t/t4252/am-test-6-1
+++ /dev/null
@@ -1,21 +0,0 @@
-From: A U Thor <au.thor@example.com>
-Date: Thu Dec 4 16:00:00 2008 -0800
-Subject: Huh
-
-Should fail and leave rejects
-
-diff --git i/file-2 w/file-2
-index 06e567b..b6f3a16 100644
---- i/file-2
-+++ w/file-2
-@@ -1,3 +1,3 @@
--0
-+One
- 2
- 3
-@@ -4,4 +4,4 @@
- 4
- 5
--6
-+Six
- 7
diff --git a/third_party/git/t/t4252/file-1-0 b/third_party/git/t/t4252/file-1-0
deleted file mode 100644
index 06e567b11d..0000000000
--- a/third_party/git/t/t4252/file-1-0
+++ /dev/null
@@ -1,7 +0,0 @@
-1
-2
-3
-4
-5
-6
-7
diff --git a/third_party/git/t/t4252/file-2-0 b/third_party/git/t/t4252/file-2-0
deleted file mode 100644
index 06e567b11d..0000000000
--- a/third_party/git/t/t4252/file-2-0
+++ /dev/null
@@ -1,7 +0,0 @@
-1
-2
-3
-4
-5
-6
-7