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

(limited to 'third_party/git/t/t5514-fetch-multiple.sh')

diff --git a/third_party/git/t/t5514-fetch-multiple.sh b/third_party/git/t/t5514-fetch-multiple.sh
deleted file mode 100755
index bd202ec6f31e..000000000000
--- a/third_party/git/t/t5514-fetch-multiple.sh
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/bin/sh
-
-test_description='fetch --all works correctly'
-
-. ./test-lib.sh
-
-setup_repository () {
-	mkdir "$1" && (
-	cd "$1" &&
-	git init &&
-	>file &&
-	git add file &&
-	test_tick &&
-	git commit -m "Initial" &&
-	git checkout -b side &&
-	>elif &&
-	git add elif &&
-	test_tick &&
-	git commit -m "Second" &&
-	git checkout master
-	)
-}
-
-test_expect_success setup '
-	setup_repository one &&
-	setup_repository two &&
-	(
-		cd two && git branch another
-	) &&
-	git clone --mirror two three &&
-	git clone one test
-'
-
-cat > test/expect << EOF
-  one/master
-  one/side
-  origin/HEAD -> origin/master
-  origin/master
-  origin/side
-  three/another
-  three/master
-  three/side
-  two/another
-  two/master
-  two/side
-EOF
-
-test_expect_success 'git fetch --all' '
-	(cd test &&
-	 git remote add one ../one &&
-	 git remote add two ../two &&
-	 git remote add three ../three &&
-	 git fetch --all &&
-	 git branch -r > output &&
-	 test_cmp expect output)
-'
-
-test_expect_success 'git fetch --all should continue if a remote has errors' '
-	(git clone one test2 &&
-	 cd test2 &&
-	 git remote add bad ../non-existing &&
-	 git remote add one ../one &&
-	 git remote add two ../two &&
-	 git remote add three ../three &&
-	 test_must_fail git fetch --all &&
-	 git branch -r > output &&
-	 test_cmp ../test/expect output)
-'
-
-test_expect_success 'git fetch --all does not allow non-option arguments' '
-	(cd test &&
-	 test_must_fail git fetch --all origin &&
-	 test_must_fail git fetch --all origin master)
-'
-
-cat > expect << EOF
-  origin/HEAD -> origin/master
-  origin/master
-  origin/side
-  three/another
-  three/master
-  three/side
-EOF
-
-test_expect_success 'git fetch --multiple (but only one remote)' '
-	(git clone one test3 &&
-	 cd test3 &&
-	 git remote add three ../three &&
-	 git fetch --multiple three &&
-	 git branch -r > output &&
-	 test_cmp ../expect output)
-'
-
-cat > expect << EOF
-  one/master
-  one/side
-  two/another
-  two/master
-  two/side
-EOF
-
-test_expect_success 'git fetch --multiple (two remotes)' '
-	(git clone one test4 &&
-	 cd test4 &&
-	 git remote rm origin &&
-	 git remote add one ../one &&
-	 git remote add two ../two &&
-	 GIT_TRACE=1 git fetch --multiple one two 2>trace &&
-	 git branch -r > output &&
-	 test_cmp ../expect output &&
-	 grep "built-in: git maintenance" trace >gc &&
-	 test_line_count = 1 gc
-	)
-'
-
-test_expect_success 'git fetch --multiple (bad remote names)' '
-	(cd test4 &&
-	 test_must_fail git fetch --multiple four)
-'
-
-
-test_expect_success 'git fetch --all (skipFetchAll)' '
-	(cd test4 &&
-	 for b in $(git branch -r)
-	 do
-		git branch -r -d $b || exit 1
-	 done &&
-	 git remote add three ../three &&
-	 git config remote.three.skipFetchAll true &&
-	 git fetch --all &&
-	 git branch -r > output &&
-	 test_cmp ../expect output)
-'
-
-cat > expect << EOF
-  one/master
-  one/side
-  three/another
-  three/master
-  three/side
-  two/another
-  two/master
-  two/side
-EOF
-
-test_expect_success 'git fetch --multiple (ignoring skipFetchAll)' '
-	(cd test4 &&
-	 for b in $(git branch -r)
-	 do
-		git branch -r -d $b || exit 1
-	 done &&
-	 git fetch --multiple one two three &&
-	 git branch -r > output &&
-	 test_cmp ../expect output)
-'
-
-test_expect_success 'git fetch --all --no-tags' '
-	git clone one test5 &&
-	git clone test5 test6 &&
-	(cd test5 && git tag test-tag) &&
-	(
-		cd test6 &&
-		git fetch --all --no-tags &&
-		git tag >output
-	) &&
-	test_must_be_empty test6/output
-'
-
-test_expect_success 'git fetch --all --tags' '
-	echo test-tag >expect &&
-	git clone one test7 &&
-	git clone test7 test8 &&
-	(
-		cd test7 &&
-		test_commit test-tag &&
-		git reset --hard HEAD^
-	) &&
-	(
-		cd test8 &&
-		git fetch --all --tags &&
-		git tag >output
-	) &&
-	test_cmp expect test8/output
-'
-
-test_expect_success 'parallel' '
-	git remote add one ./bogus1 &&
-	git remote add two ./bogus2 &&
-
-	test_must_fail env GIT_TRACE="$PWD/trace" \
-		git fetch --jobs=2 --multiple one two 2>err &&
-	grep "preparing to run up to 2 tasks" trace &&
-	test_i18ngrep "could not fetch .one.*128" err &&
-	test_i18ngrep "could not fetch .two.*128" err
-'
-
-test_done
-- 
cgit 1.4.1