From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead 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 --- third_party/git/t/t7505/expected-rebase-i | 18 ------------------ third_party/git/t/t7505/expected-rebase-p | 18 ------------------ 2 files changed, 36 deletions(-) delete mode 100644 third_party/git/t/t7505/expected-rebase-i delete mode 100644 third_party/git/t/t7505/expected-rebase-p (limited to 'third_party/git/t/t7505') diff --git a/third_party/git/t/t7505/expected-rebase-i b/third_party/git/t/t7505/expected-rebase-i deleted file mode 100644 index 93bada596e25..000000000000 --- a/third_party/git/t/t7505/expected-rebase-i +++ /dev/null @@ -1,18 +0,0 @@ -message [edit rebase-13] -message (no editor) [edit rebase-13] -message [squash rebase-12] -message (no editor) [squash rebase-11] -default [edit rebase-10] -message (no editor) [edit rebase-10] -message [fixup rebase-9] -message (no editor) [fixup rebase-8] -message (no editor) [squash rebase-7] -HEAD [reword rebase-6] -message (no editor) [reword rebase-6] -message [squash rebase-5] -message (no editor) [fixup rebase-4] -message (no editor) [pick rebase-3] -message (no editor) [fixup rebase-2] -message (no editor) [fixup rebase-1] -merge [pick rebase-b] -message [pick rebase-a] diff --git a/third_party/git/t/t7505/expected-rebase-p b/third_party/git/t/t7505/expected-rebase-p deleted file mode 100644 index 93bada596e25..000000000000 --- a/third_party/git/t/t7505/expected-rebase-p +++ /dev/null @@ -1,18 +0,0 @@ -message [edit rebase-13] -message (no editor) [edit rebase-13] -message [squash rebase-12] -message (no editor) [squash rebase-11] -default [edit rebase-10] -message (no editor) [edit rebase-10] -message [fixup rebase-9] -message (no editor) [fixup rebase-8] -message (no editor) [squash rebase-7] -HEAD [reword rebase-6] -message (no editor) [reword rebase-6] -message [squash rebase-5] -message (no editor) [fixup rebase-4] -message (no editor) [pick rebase-3] -message (no editor) [fixup rebase-2] -message (no editor) [fixup rebase-1] -merge [pick rebase-b] -message [pick rebase-a] -- cgit 1.4.1