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/t7811-grep-open.sh | 158 -----------------------------------
 1 file changed, 158 deletions(-)
 delete mode 100755 third_party/git/t/t7811-grep-open.sh

(limited to 'third_party/git/t/t7811-grep-open.sh')

diff --git a/third_party/git/t/t7811-grep-open.sh b/third_party/git/t/t7811-grep-open.sh
deleted file mode 100755
index a98785da7955..000000000000
--- a/third_party/git/t/t7811-grep-open.sh
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/sh
-
-test_description='git grep --open-files-in-pager
-'
-
-. ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-pager.sh
-unset PAGER GIT_PAGER
-
-test_expect_success 'setup' '
-	test_commit initial grep.h "
-enum grep_pat_token {
-	GREP_PATTERN,
-	GREP_PATTERN_HEAD,
-	GREP_PATTERN_BODY,
-	GREP_AND,
-	GREP_OPEN_PAREN,
-	GREP_CLOSE_PAREN,
-	GREP_NOT,
-	GREP_OR,
-};" &&
-
-	test_commit add-user revision.c "
-	}
-	if (seen_dashdash)
-		read_pathspec_from_stdin(revs, &sb, prune);
-	strbuf_release(&sb);
-}
-
-static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
-{
-	append_grep_pattern(&revs->grep_filter, ptn, \"command line\", 0, what);
-" &&
-
-	mkdir subdir &&
-	test_commit subdir subdir/grep.c "enum grep_pat_token" &&
-
-	test_commit uninteresting unrelated "hello, world" &&
-
-	echo GREP_PATTERN >untracked
-'
-
-test_expect_success SIMPLEPAGER 'git grep -O' '
-	cat >$less <<-\EOF &&
-	#!/bin/sh
-	printf "%s\n" "$@" >pager-args
-	EOF
-	chmod +x $less &&
-	cat >expect.less <<-\EOF &&
-	+/*GREP_PATTERN
-	grep.h
-	EOF
-	echo grep.h >expect.notless &&
-
-	PATH=.:$PATH git grep -O GREP_PATTERN >out &&
-	{
-		test_cmp expect.less pager-args ||
-		test_cmp expect.notless pager-args
-	} &&
-	test_must_be_empty out
-'
-
-test_expect_success 'git grep -O --cached' '
-	test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
-	test_i18ngrep open-files-in-pager msg
-'
-
-test_expect_success 'git grep -O --no-index' '
-	rm -f expect.less pager-args out &&
-	cat >expect <<-\EOF &&
-	grep.h
-	untracked
-	EOF
-
-	(
-		GIT_PAGER='\''printf "%s\n" >pager-args'\'' &&
-		export GIT_PAGER &&
-		git grep --no-index -O GREP_PATTERN >out
-	) &&
-	test_cmp expect pager-args &&
-	test_must_be_empty out
-'
-
-test_expect_success 'setup: fake "less"' '
-	cat >less <<-\EOF &&
-	#!/bin/sh
-	printf "%s\n" "$@" >actual
-	EOF
-	chmod +x less
-'
-
-test_expect_success 'git grep -O jumps to line in less' '
-	cat >expect <<-\EOF &&
-	+/*GREP_PATTERN
-	grep.h
-	EOF
-
-	GIT_PAGER=./less git grep -O GREP_PATTERN >out &&
-	test_cmp expect actual &&
-	test_must_be_empty out &&
-
-	git grep -O./less GREP_PATTERN >out2 &&
-	test_cmp expect actual &&
-	test_must_be_empty out2
-'
-
-test_expect_success 'modified file' '
-	rm -f actual &&
-	cat >expect <<-\EOF &&
-	+/*enum grep_pat_token
-	grep.h
-	revision.c
-	subdir/grep.c
-	unrelated
-	EOF
-
-	echo "enum grep_pat_token" >unrelated &&
-	test_when_finished "git checkout HEAD unrelated" &&
-	GIT_PAGER=./less git grep -F -O "enum grep_pat_token" >out &&
-	test_cmp expect actual &&
-	test_must_be_empty out
-'
-
-test_expect_success 'copes with color settings' '
-	rm -f actual &&
-	echo grep.h >expect &&
-	test_config color.grep always &&
-	test_config color.grep.filename yellow &&
-	test_config color.grep.separator green &&
-	git grep -O'\''printf "%s\n" >actual'\'' GREP_AND &&
-	test_cmp expect actual
-'
-
-test_expect_success 'run from subdir' '
-	rm -f actual &&
-	echo grep.c >expect &&
-
-	(
-		cd subdir &&
-		export GIT_PAGER &&
-		GIT_PAGER='\''printf "%s\n" >../args'\'' &&
-		git grep -O "enum grep_pat_token" >../out &&
-		git grep -O"pwd >../dir; :" "enum grep_pat_token" >../out2
-	) &&
-	case $(cat dir) in
-	*subdir)
-		: good
-		;;
-	*)
-		false
-		;;
-	esac &&
-	test_cmp expect args &&
-	test_must_be_empty out &&
-	test_must_be_empty out2
-'
-
-test_done
-- 
cgit 1.4.1