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/t5536-fetch-conflicts.sh | 86 ------------------------------
 1 file changed, 86 deletions(-)
 delete mode 100755 third_party/git/t/t5536-fetch-conflicts.sh

(limited to 'third_party/git/t/t5536-fetch-conflicts.sh')

diff --git a/third_party/git/t/t5536-fetch-conflicts.sh b/third_party/git/t/t5536-fetch-conflicts.sh
deleted file mode 100755
index 91f28c2f783d..000000000000
--- a/third_party/git/t/t5536-fetch-conflicts.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-test_description='fetch handles conflicting refspecs correctly'
-
-. ./test-lib.sh
-
-D=$(pwd)
-
-setup_repository () {
-	git init "$1" && (
-		cd "$1" &&
-		git config remote.origin.url "$D" &&
-		shift &&
-		for refspec in "$@"
-		do
-			git config --add remote.origin.fetch "$refspec"
-		done
-	)
-}
-
-test_expect_success 'setup' '
-	git commit --allow-empty -m "Initial" &&
-	git branch branch1 &&
-	git tag tag1 &&
-	git commit --allow-empty -m "First" &&
-	git branch branch2 &&
-	git tag tag2
-'
-
-test_expect_success 'fetch with no conflict' '
-	setup_repository ok "+refs/heads/*:refs/remotes/origin/*" && (
-		cd ok &&
-		git fetch origin
-	)
-'
-
-test_expect_success 'fetch conflict: config vs. config' '
-	setup_repository ccc \
-		"+refs/heads/branch1:refs/remotes/origin/branch1" \
-		"+refs/heads/branch2:refs/remotes/origin/branch1" && (
-		cd ccc &&
-		test_must_fail git fetch origin 2>error &&
-		test_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
-	)
-'
-
-test_expect_success 'fetch duplicate: config vs. config' '
-	setup_repository dcc \
-		"+refs/heads/*:refs/remotes/origin/*" \
-		"+refs/heads/branch1:refs/remotes/origin/branch1" && (
-		cd dcc &&
-		git fetch origin
-	)
-'
-
-test_expect_success 'fetch conflict: arg overrides config' '
-	setup_repository aoc \
-		"+refs/heads/*:refs/remotes/origin/*" && (
-		cd aoc &&
-		git fetch origin refs/heads/branch2:refs/remotes/origin/branch1
-	)
-'
-
-test_expect_success 'fetch conflict: arg vs. arg' '
-	setup_repository caa && (
-		cd caa &&
-		test_must_fail git fetch origin \
-			refs/heads/*:refs/remotes/origin/* \
-			refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
-		test_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
-	)
-'
-
-test_expect_success 'fetch conflict: criss-cross args' '
-	setup_repository xaa \
-		"+refs/heads/*:refs/remotes/origin/*" && (
-		cd xaa &&
-		git fetch origin \
-			refs/heads/branch1:refs/remotes/origin/branch2 \
-			refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
-		test_i18ngrep "warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2" error &&
-		test_i18ngrep "warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1" error
-	)
-'
-
-test_done
-- 
cgit 1.4.1