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/t4153-am-resume-override-opts.sh | 102 ---------------------
 1 file changed, 102 deletions(-)
 delete mode 100755 third_party/git/t/t4153-am-resume-override-opts.sh

(limited to 'third_party/git/t/t4153-am-resume-override-opts.sh')

diff --git a/third_party/git/t/t4153-am-resume-override-opts.sh b/third_party/git/t/t4153-am-resume-override-opts.sh
deleted file mode 100755
index 8ea22d1bcbb8..000000000000
--- a/third_party/git/t/t4153-am-resume-override-opts.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-
-test_description='git-am command-line options override saved options'
-
-. ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-terminal.sh
-
-format_patch () {
-	git format-patch --stdout -1 "$1" >"$1".eml
-}
-
-test_expect_success 'setup' '
-	test_commit initial file &&
-	test_commit first file &&
-
-	git checkout initial &&
-	git mv file file2 &&
-	test_tick &&
-	git commit -m renamed-file &&
-	git tag renamed-file &&
-
-	git checkout -b side initial &&
-	test_commit side1 file &&
-	test_commit side2 file &&
-
-	format_patch side1 &&
-	format_patch side2
-'
-
-test_expect_success TTY '--3way overrides --no-3way' '
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout renamed-file &&
-
-	# Applying side1 will fail as the file has been renamed.
-	test_must_fail git am --no-3way side[12].eml &&
-	test_path_is_dir .git/rebase-apply &&
-	test_cmp_rev renamed-file HEAD &&
-	test -z "$(git ls-files -u)" &&
-
-	# Applying side1 with am --3way will succeed due to the threeway-merge.
-	# Applying side2 will fail as --3way does not apply to it.
-	test_must_fail test_terminal git am --3way </dev/zero &&
-	test_path_is_dir .git/rebase-apply &&
-	test side1 = "$(cat file2)"
-'
-
-test_expect_success '--no-quiet overrides --quiet' '
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-
-	# Applying side1 will be quiet.
-	test_must_fail git am --quiet side[123].eml >out &&
-	test_path_is_dir .git/rebase-apply &&
-	test_i18ngrep ! "^Applying: " out &&
-	echo side1 >file &&
-	git add file &&
-
-	# Applying side1 will not be quiet.
-	# Applying side2 will be quiet.
-	git am --no-quiet --continue >out &&
-	echo "Applying: side1" >expected &&
-	test_i18ncmp expected out
-'
-
-test_expect_success '--signoff overrides --no-signoff' '
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-
-	test_must_fail git am --no-signoff side[12].eml &&
-	test_path_is_dir .git/rebase-apply &&
-	echo side1 >file &&
-	git add file &&
-	git am --signoff --continue &&
-
-	# Applied side1 will be signed off
-	echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >expected &&
-	git cat-file commit HEAD^ | grep "Signed-off-by:" >actual &&
-	test_cmp expected actual &&
-
-	# Applied side2 will not be signed off
-	test $(git cat-file commit HEAD | grep -c "Signed-off-by:") -eq 0
-'
-
-test_expect_success TTY '--reject overrides --no-reject' '
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	rm -f file.rej &&
-
-	test_must_fail git am --no-reject side1.eml &&
-	test_path_is_dir .git/rebase-apply &&
-	test_path_is_missing file.rej &&
-
-	test_must_fail test_terminal git am --reject </dev/zero &&
-	test_path_is_dir .git/rebase-apply &&
-	test_path_is_file file.rej
-'
-
-test_done
-- 
cgit 1.4.1