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/t4109 | |
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/t4109')
-rw-r--r-- | third_party/git/t/t4109/expect-1 | 31 | ||||
-rw-r--r-- | third_party/git/t/t4109/expect-2 | 23 | ||||
-rw-r--r-- | third_party/git/t/t4109/expect-3 | 24 | ||||
-rw-r--r-- | third_party/git/t/t4109/patch1.patch | 28 | ||||
-rw-r--r-- | third_party/git/t/t4109/patch2.patch | 30 | ||||
-rw-r--r-- | third_party/git/t/t4109/patch3.patch | 31 | ||||
-rw-r--r-- | third_party/git/t/t4109/patch4.patch | 30 |
7 files changed, 0 insertions, 197 deletions
diff --git a/third_party/git/t/t4109/expect-1 b/third_party/git/t/t4109/expect-1 deleted file mode 100644 index 1db5ff105014..000000000000 --- a/third_party/git/t/t4109/expect-1 +++ /dev/null @@ -1,31 +0,0 @@ -#include <stdlib.h> -#include <stdio.h> - -int func(int num); -void print_int(int num); -void print_ln(); - -int main() { - int i; - - for (i = 0; i < 10; i++) { - print_int(func(i)); - } - - print_ln(); - - return 0; -} - -int func(int num) { - return num * num; -} - -void print_int(int num) { - printf("%d", num); -} - -void print_ln() { - printf("\n"); -} - diff --git a/third_party/git/t/t4109/expect-2 b/third_party/git/t/t4109/expect-2 deleted file mode 100644 index bc52924112ba..000000000000 --- a/third_party/git/t/t4109/expect-2 +++ /dev/null @@ -1,23 +0,0 @@ -#include <stdio.h> - -int func(int num); -void print_int(int num); - -int main() { - int i; - - for (i = 0; i < 10; i++) { - print_int(func(i)); - } - - return 0; -} - -int func(int num) { - return num * num; -} - -void print_int(int num) { - printf("%d", num); -} - diff --git a/third_party/git/t/t4109/expect-3 b/third_party/git/t/t4109/expect-3 deleted file mode 100644 index cd2a475feb22..000000000000 --- a/third_party/git/t/t4109/expect-3 +++ /dev/null @@ -1,24 +0,0 @@ -#include <stdio.h> - -int func(int num); -int func2(int num); - -int main() { - int i; - - for (i = 0; i < 10; i++) { - printf("%d", func(i)); - printf("%d", func3(i)); - } - - return 0; -} - -int func(int num) { - return num * num; -} - -int func2(int num) { - return num * num * num; -} - diff --git a/third_party/git/t/t4109/patch1.patch b/third_party/git/t/t4109/patch1.patch deleted file mode 100644 index 1d411fc3cceb..000000000000 --- a/third_party/git/t/t4109/patch1.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/main.c b/main.c -new file mode 100644 ---- /dev/null -+++ b/main.c -@@ -0,0 +1,23 @@ -+#include <stdio.h> -+ -+int func(int num); -+void print_int(int num); -+ -+int main() { -+ int i; -+ -+ for (i = 0; i < 10; i++) { -+ print_int(func(i)); -+ } -+ -+ return 0; -+} -+ -+int func(int num) { -+ return num * num; -+} -+ -+void print_int(int num) { -+ printf("%d", num); -+} -+ diff --git a/third_party/git/t/t4109/patch2.patch b/third_party/git/t/t4109/patch2.patch deleted file mode 100644 index 8c6b06d536a0..000000000000 --- a/third_party/git/t/t4109/patch2.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/main.c b/main.c ---- a/main.c -+++ b/main.c -@@ -1,7 +1,9 @@ -+#include <stdlib.h> - #include <stdio.h> - - int func(int num); - void print_int(int num); -+void print_ln(); - - int main() { - int i; -@@ -10,6 +12,8 @@ - print_int(func(i)); - } - -+ print_ln(); -+ - return 0; - } - -@@ -21,3 +25,7 @@ - printf("%d", num); - } - -+void print_ln() { -+ printf("\n"); -+} -+ diff --git a/third_party/git/t/t4109/patch3.patch b/third_party/git/t/t4109/patch3.patch deleted file mode 100644 index d696c55a752a..000000000000 --- a/third_party/git/t/t4109/patch3.patch +++ /dev/null @@ -1,31 +0,0 @@ -cat > patch3.patch <<\EOF -diff --git a/main.c b/main.c ---- a/main.c -+++ b/main.c -@@ -1,9 +1,7 @@ --#include <stdlib.h> - #include <stdio.h> - - int func(int num); - void print_int(int num); --void print_ln(); - - int main() { - int i; -@@ -12,8 +10,6 @@ - print_int(func(i)); - } - -- print_ln(); -- - return 0; - } - -@@ -25,7 +21,3 @@ - printf("%d", num); - } - --void print_ln() { -- printf("\n"); --} -- diff --git a/third_party/git/t/t4109/patch4.patch b/third_party/git/t/t4109/patch4.patch deleted file mode 100644 index 4b085909b160..000000000000 --- a/third_party/git/t/t4109/patch4.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/main.c b/main.c ---- a/main.c -+++ b/main.c -@@ -1,13 +1,14 @@ - #include <stdio.h> - - int func(int num); --void print_int(int num); -+int func2(int num); - - int main() { - int i; - - for (i = 0; i < 10; i++) { -- print_int(func(i)); -+ printf("%d", func(i)); -+ printf("%d", func3(i)); - } - - return 0; -@@ -17,7 +18,7 @@ - return num * num; - } - --void print_int(int num) { -- printf("%d", num); -+int func2(int num) { -+ return num * num * num; - } - |