diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t4252 | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/t/t4252')
-rw-r--r-- | third_party/git/t/t4252/am-test-1-1 | 19 | ||||
-rw-r--r-- | third_party/git/t/t4252/am-test-1-2 | 21 | ||||
-rw-r--r-- | third_party/git/t/t4252/am-test-2-1 | 19 | ||||
-rw-r--r-- | third_party/git/t/t4252/am-test-2-2 | 21 | ||||
-rw-r--r-- | third_party/git/t/t4252/am-test-3-1 | 19 | ||||
-rw-r--r-- | third_party/git/t/t4252/am-test-3-2 | 21 | ||||
-rw-r--r-- | third_party/git/t/t4252/am-test-4-1 | 19 | ||||
-rw-r--r-- | third_party/git/t/t4252/am-test-4-2 | 22 | ||||
-rw-r--r-- | third_party/git/t/t4252/am-test-5-1 | 20 | ||||
-rw-r--r-- | third_party/git/t/t4252/am-test-5-2 | 15 | ||||
-rw-r--r-- | third_party/git/t/t4252/am-test-6-1 | 21 | ||||
-rw-r--r-- | third_party/git/t/t4252/file-1-0 | 7 | ||||
-rw-r--r-- | third_party/git/t/t4252/file-2-0 | 7 |
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 b0c09dc96583..000000000000 --- 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 1b874ae115d1..000000000000 --- 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 feda94a0cccb..000000000000 --- 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 2ac66009763f..000000000000 --- 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 608e5abba4c3..000000000000 --- 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 0081b96f2a92..000000000000 --- 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 e48cd6cbde98..000000000000 --- 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 0e69bfa55b8a..000000000000 --- 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 da7bf29cbe30..000000000000 --- 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 373025bcf614..000000000000 --- 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 a8859e9b8f6c..000000000000 --- 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 06e567b11dfd..000000000000 --- 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 06e567b11dfd..000000000000 --- a/third_party/git/t/t4252/file-2-0 +++ /dev/null @@ -1,7 +0,0 @@ -1 -2 -3 -4 -5 -6 -7 |