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/t4135 | |
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/t4135')
20 files changed, 0 insertions, 148 deletions
diff --git a/third_party/git/t/t4135/.gitignore b/third_party/git/t/t4135/.gitignore deleted file mode 100644 index 3e58e65f57e5..000000000000 --- a/third_party/git/t/t4135/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/file-creation/ -/trad-creation/ -/trad-modification/ diff --git a/third_party/git/t/t4135/add-plain.diff b/third_party/git/t/t4135/add-plain.diff deleted file mode 100644 index cf5970a089fa..000000000000 --- a/third_party/git/t/t4135/add-plain.diff +++ /dev/null @@ -1,5 +0,0 @@ -diff -pruN a/postimage.txt b/postimage.txt ---- a/postimage.txt 1969-12-31 18:00:00.000000000 -0600 -+++ b/postimage.txt 2010-08-18 20:13:31.484002255 -0500 -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/add-with backslash.diff b/third_party/git/t/t4135/add-with backslash.diff deleted file mode 100644 index c6861e19665b..000000000000 --- a/third_party/git/t/t4135/add-with backslash.diff +++ /dev/null @@ -1,5 +0,0 @@ -diff -pruN a/post\image.txt b/post\image.txt ---- a/post\image.txt 1969-12-31 18:00:00.000000000 -0600 -+++ b/post\image.txt 2010-08-18 20:13:31.692002255 -0500 -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/add-with quote.diff b/third_party/git/t/t4135/add-with quote.diff deleted file mode 100644 index 866de78ca170..000000000000 --- a/third_party/git/t/t4135/add-with quote.diff +++ /dev/null @@ -1,5 +0,0 @@ -diff -pruN a/"postimage".txt b/"postimage".txt ---- a/"postimage".txt 1969-12-31 18:00:00.000000000 -0600 -+++ b/"postimage".txt 2010-08-18 20:13:31.756002255 -0500 -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/add-with spaces.diff b/third_party/git/t/t4135/add-with spaces.diff deleted file mode 100644 index a9a1212a218a..000000000000 --- a/third_party/git/t/t4135/add-with spaces.diff +++ /dev/null @@ -1,5 +0,0 @@ -diff -pruN a/post image.txt b/post image.txt ---- a/post image.txt 1969-12-31 18:00:00.000000000 -0600 -+++ b/post image.txt 2010-08-18 20:13:31.556002255 -0500 -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/add-with tab.diff b/third_party/git/t/t4135/add-with tab.diff deleted file mode 100644 index bb67cb79309b..000000000000 --- a/third_party/git/t/t4135/add-with tab.diff +++ /dev/null @@ -1,5 +0,0 @@ -diff -pruN a/post image.txt b/post image.txt ---- a/post image.txt 1969-12-31 18:00:00.000000000 -0600 -+++ b/post image.txt 2010-08-18 20:13:31.628002255 -0500 -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/damaged-tz.diff b/third_party/git/t/t4135/damaged-tz.diff deleted file mode 100644 index 07aaf0837093..000000000000 --- a/third_party/git/t/t4135/damaged-tz.diff +++ /dev/null @@ -1,5 +0,0 @@ -diff -urN -X /usr/people/jes/exclude-linux linux-2.6.12-rc2-mm3-vanilla/post image.txt linux-2.6.12-rc2-mm3/post image.txt ---- linux-2.6.12-rc2-mm3-vanilla/post image.txt 1969-12-31 16:00:00 -08:00 -+++ linux-2.6.12-rc2-mm3/post image.txt 2005-04-12 02:14:06 -07:00 -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/damaged.diff b/third_party/git/t/t4135/damaged.diff deleted file mode 100644 index 68f7ededf91e..000000000000 --- a/third_party/git/t/t4135/damaged.diff +++ /dev/null @@ -1,5 +0,0 @@ -diff -pruN a/postimage.txt b/postimage.txt ---- a/postimage.txt 1969-12-31 18:00:00.000000000 -0600 -+++ b/postimage.txt 2010-08-18 20:13:31.484002255 -0500 -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/diff-plain.diff b/third_party/git/t/t4135/diff-plain.diff deleted file mode 100644 index acedcfa612e3..000000000000 --- a/third_party/git/t/t4135/diff-plain.diff +++ /dev/null @@ -1,5 +0,0 @@ ---- postimage.txt.orig 2010-08-18 20:13:31.432002255 -0500 -+++ postimage.txt 2010-08-18 20:13:31.432002255 -0500 -@@ -1 +1 @@ --preimage -+postimage diff --git a/third_party/git/t/t4135/diff-with backslash.diff b/third_party/git/t/t4135/diff-with backslash.diff deleted file mode 100644 index 9068a61bd982..000000000000 --- a/third_party/git/t/t4135/diff-with backslash.diff +++ /dev/null @@ -1,5 +0,0 @@ ---- post\image.txt.orig 2010-08-18 20:13:31.680002255 -0500 -+++ post\image.txt 2010-08-18 20:13:31.680002255 -0500 -@@ -1 +1 @@ --preimage -+postimage diff --git a/third_party/git/t/t4135/diff-with quote.diff b/third_party/git/t/t4135/diff-with quote.diff deleted file mode 100644 index c8e8cc1a8d64..000000000000 --- a/third_party/git/t/t4135/diff-with quote.diff +++ /dev/null @@ -1,5 +0,0 @@ ---- "postimage".txt.orig 2010-08-18 20:13:31.744002255 -0500 -+++ "postimage".txt 2010-08-18 20:13:31.744002255 -0500 -@@ -1 +1 @@ --preimage -+postimage diff --git a/third_party/git/t/t4135/diff-with spaces.diff b/third_party/git/t/t4135/diff-with spaces.diff deleted file mode 100644 index 3512056f2194..000000000000 --- a/third_party/git/t/t4135/diff-with spaces.diff +++ /dev/null @@ -1,5 +0,0 @@ ---- post image.txt.orig 2010-08-18 20:13:31.544002255 -0500 -+++ post image.txt 2010-08-18 20:13:31.544002255 -0500 -@@ -1 +1 @@ --preimage -+postimage diff --git a/third_party/git/t/t4135/diff-with tab.diff b/third_party/git/t/t4135/diff-with tab.diff deleted file mode 100644 index 4e6d9b294154..000000000000 --- a/third_party/git/t/t4135/diff-with tab.diff +++ /dev/null @@ -1,5 +0,0 @@ ---- post image.txt.orig 2010-08-18 20:13:31.616002255 -0500 -+++ post image.txt 2010-08-18 20:13:31.616002255 -0500 -@@ -1 +1 @@ --preimage -+postimage diff --git a/third_party/git/t/t4135/funny-tz.diff b/third_party/git/t/t4135/funny-tz.diff deleted file mode 100644 index 998e3a867e46..000000000000 --- a/third_party/git/t/t4135/funny-tz.diff +++ /dev/null @@ -1,5 +0,0 @@ -diff -urN -X /usr/people/jes/exclude-linux linux-2.6.12-rc2-mm3-vanilla/post image.txt linux-2.6.12-rc2-mm3/post image.txt ---- linux-2.6.12-rc2-mm3-vanilla/post image.txt 1969-12-31 16:00:00 -08:00 -+++ linux-2.6.12-rc2-mm3/post image.txt 2005-04-12 02:14:06 -07:00 -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/git-plain.diff b/third_party/git/t/t4135/git-plain.diff deleted file mode 100644 index db47d1a693c5..000000000000 --- a/third_party/git/t/t4135/git-plain.diff +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/postimage.txt b/postimage.txt -new file mode 100644 -index 0000000..eff0c54 ---- /dev/null -+++ b/postimage.txt -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/git-with backslash.diff b/third_party/git/t/t4135/git-with backslash.diff deleted file mode 100644 index 0e84a10e936d..000000000000 --- a/third_party/git/t/t4135/git-with backslash.diff +++ /dev/null @@ -1,7 +0,0 @@ -diff --git "a/post\\image.txt" "b/post\\image.txt" -new file mode 100644 -index 0000000..eff0c54 ---- /dev/null -+++ "b/post\\image.txt" -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/git-with quote.diff b/third_party/git/t/t4135/git-with quote.diff deleted file mode 100644 index bdbea8af35d3..000000000000 --- a/third_party/git/t/t4135/git-with quote.diff +++ /dev/null @@ -1,7 +0,0 @@ -diff --git "a/\"postimage\".txt" "b/\"postimage\".txt" -new file mode 100644 -index 0000000..eff0c54 ---- /dev/null -+++ "b/\"postimage\".txt" -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/git-with spaces.diff b/third_party/git/t/t4135/git-with spaces.diff deleted file mode 100644 index baaa810de03e..000000000000 --- a/third_party/git/t/t4135/git-with spaces.diff +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/post image.txt b/post image.txt -new file mode 100644 -index 0000000..eff0c54 ---- /dev/null -+++ b/post image.txt -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/git-with tab.diff b/third_party/git/t/t4135/git-with tab.diff deleted file mode 100644 index cca3c9287b21..000000000000 --- a/third_party/git/t/t4135/git-with tab.diff +++ /dev/null @@ -1,7 +0,0 @@ -diff --git "a/post\timage.txt" "b/post\timage.txt" -new file mode 100644 -index 0000000..eff0c54 ---- /dev/null -+++ "b/post\timage.txt" -@@ -0,0 +1 @@ -+postimage diff --git a/third_party/git/t/t4135/make-patches b/third_party/git/t/t4135/make-patches deleted file mode 100755 index f5f45ddd099e..000000000000 --- a/third_party/git/t/t4135/make-patches +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -do_filename() { - desc=$1 - postimage=$2 - - rm -fr file-creation && - git init file-creation && - ( - cd file-creation && - git commit --allow-empty -m init && - echo postimage >"$postimage" && - git add -N "$postimage" && - git diff HEAD >"../git-$desc.diff" - ) && - - rm -fr trad-modification && - mkdir trad-modification && - ( - cd trad-modification && - echo preimage >"$postimage.orig" && - echo postimage >"$postimage" && - ! diff -u "$postimage.orig" "$postimage" >"../diff-$desc.diff" - ) && - - rm -fr trad-creation && - mkdir trad-creation && - ( - cd trad-creation && - mkdir a b && - echo postimage >"b/$postimage" && - ! diff -pruN a b >"../add-$desc.diff" - ) -} - -do_filename plain postimage.txt && -do_filename 'with spaces' 'post image.txt' && -do_filename 'with tab' 'post image.txt' && -do_filename 'with backslash' 'post\image.txt' && -do_filename 'with quote' '"postimage".txt' && -expand add-plain.diff >damaged.diff || -{ - echo >&2 Failed. && - exit 1 -} |