From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
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/t8012-blame-colors.sh | 48 ---------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100755 third_party/git/t/t8012-blame-colors.sh

(limited to 'third_party/git/t/t8012-blame-colors.sh')

diff --git a/third_party/git/t/t8012-blame-colors.sh b/third_party/git/t/t8012-blame-colors.sh
deleted file mode 100755
index ed38f74de95c..000000000000
--- a/third_party/git/t/t8012-blame-colors.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-test_description='colored git blame'
-. ./test-lib.sh
-
-PROG='git blame -c'
-. "$TEST_DIRECTORY"/annotate-tests.sh
-
-test_expect_success 'colored blame colors contiguous lines' '
-	git -c color.blame.repeatedLines=yellow blame --color-lines --abbrev=12 hello.c >actual.raw &&
-	git -c color.blame.repeatedLines=yellow -c blame.coloring=repeatedLines blame --abbrev=12 hello.c >actual.raw.2 &&
-	test_cmp actual.raw actual.raw.2 &&
-	test_decode_color <actual.raw >actual &&
-	grep "<YELLOW>" <actual >darkened &&
-	grep "(F" darkened > F.expect &&
-	grep "(H" darkened > H.expect &&
-	test_line_count = 2 F.expect &&
-	test_line_count = 3 H.expect
-'
-
-test_expect_success 'color by age consistently colors old code' '
-	git blame --color-by-age hello.c >actual.raw &&
-	git -c blame.coloring=highlightRecent blame hello.c >actual.raw.2 &&
-	test_cmp actual.raw actual.raw.2 &&
-	test_decode_color <actual.raw >actual &&
-	grep "<BLUE>" <actual >colored &&
-	test_line_count = 10 colored
-'
-
-test_expect_success 'blame color by age: new code is different' '
-	cat >>hello.c <<-EOF &&
-		void qfunc();
-	EOF
-	git add hello.c &&
-	GIT_AUTHOR_DATE="" git commit -m "new commit" &&
-
-	git -c color.blame.highlightRecent="yellow,1 month ago, cyan" blame --color-by-age hello.c >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-
-	grep "<YELLOW>" <actual >colored &&
-	test_line_count = 10 colored &&
-
-	grep "<CYAN>" <actual >colored &&
-	test_line_count = 1 colored &&
-	grep qfunc colored
-'
-
-test_done
-- 
cgit 1.4.1