about summary refs log tree commit diff
path: root/third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-21T10·03+0300
committerVincent Ambo <mail@tazj.in>2021-09-21T11·29+0300
commit43b1791ec601732ac31195df96781a848360a9ac (patch)
treedaae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main
parent2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (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/t4211/sha1/expect.parallel-change-f-to-main')
-rw-r--r--third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main160
1 files changed, 0 insertions, 160 deletions
diff --git a/third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main b/third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main
deleted file mode 100644
index 052def8074da..000000000000
--- a/third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main
+++ /dev/null
@@ -1,160 +0,0 @@
-commit 0469c60bc4837d52d97b1f081dec5f98dea20fed
-Merge: ba227c6 6ce3c4f
-Author: Thomas Rast <trast@inf.ethz.ch>
-Date:   Fri Apr 12 16:16:24 2013 +0200
-
-    Merge across the rename
-
-
-commit 6ce3c4ff690136099bb17e1a8766b75764726ea7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:49:50 2013 +0100
-
-    another simple change
-
-diff --git a/b.c b/b.c
---- a/b.c
-+++ b/b.c
-@@ -4,14 +4,14 @@
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
--		x >>= 1;
-+		x /= 2;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
-
-commit ba227c6632349700fbb957dec2b50f5e2358be3f
-Author: Thomas Rast <trast@inf.ethz.ch>
-Date:   Fri Apr 12 16:15:57 2013 +0200
-
-    change on another line of history while rename happens
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -4,14 +4,14 @@
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-- * This is only an example!
-+ * This is only a short example!
-  */
- 
-
-commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:41 2013 +0100
-
-    touch comment
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -3,14 +3,14 @@
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-- * A comment.
-+ * This is only an example!
-  */
- 
-
-commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:16 2013 +0100
-
-    touch both functions
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -3,14 +3,14 @@
--int f(int x)
-+long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
-
-commit f04fb20f2c77850996cba739709acc6faecc58f7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:55 2013 +0100
-
-    change f()
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -3,13 +3,14 @@
- int f(int x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
-+	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
-
-commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:48 2013 +0100
-
-    initial
-
-diff --git a/a.c b/a.c
---- /dev/null
-+++ b/a.c
-@@ -0,0 +3,13 @@
-+int f(int x)
-+{
-+	int s = 0;
-+	while (x) {
-+		x >>= 1;
-+		s++;
-+	}
-+}
-+
-+/*
-+ * A comment.
-+ */
-+