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/t9146-git-svn-empty-dirs.sh | 159 --------------------------
 1 file changed, 159 deletions(-)
 delete mode 100755 third_party/git/t/t9146-git-svn-empty-dirs.sh

(limited to 'third_party/git/t/t9146-git-svn-empty-dirs.sh')

diff --git a/third_party/git/t/t9146-git-svn-empty-dirs.sh b/third_party/git/t/t9146-git-svn-empty-dirs.sh
deleted file mode 100755
index 5f91c0d68b45..000000000000
--- a/third_party/git/t/t9146-git-svn-empty-dirs.sh
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2009 Eric Wong
-
-test_description='git svn creates empty directories'
-. ./lib-git-svn.sh
-
-test_expect_success 'initialize repo' '
-	for i in a b c d d/e d/e/f "weird file name"
-	do
-		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i"
-	done
-'
-
-test_expect_success 'clone' 'git svn clone "$svnrepo" cloned'
-
-test_expect_success 'empty directories exist' '
-	(
-		cd cloned &&
-		for i in a b c d d/e d/e/f "weird file name"
-		do
-			if ! test -d "$i"
-			then
-				echo >&2 "$i does not exist" &&
-				exit 1
-			fi
-		done
-	)
-'
-
-test_expect_success 'option automkdirs set to false' '
-	(
-		git svn init "$svnrepo" cloned-no-mkdirs &&
-		cd cloned-no-mkdirs &&
-		git config svn-remote.svn.automkdirs false &&
-		git svn fetch &&
-		for i in a b c d d/e d/e/f "weird file name"
-		do
-			if test -d "$i"
-			then
-				echo >&2 "$i exists" &&
-				exit 1
-			fi
-		done
-	)
-'
-
-test_expect_success 'more emptiness' '
-	svn_cmd mkdir -m "bang bang"  "$svnrepo"/"! !"
-'
-
-test_expect_success 'git svn rebase creates empty directory' '
-	( cd cloned && git svn rebase ) &&
-	test -d cloned/"! !"
-'
-
-test_expect_success 'git svn mkdirs recreates empty directories' '
-	(
-		cd cloned &&
-		rm -r * &&
-		git svn mkdirs &&
-		for i in a b c d d/e d/e/f "weird file name" "! !"
-		do
-			if ! test -d "$i"
-			then
-				echo >&2 "$i does not exist" &&
-				exit 1
-			fi
-		done
-	)
-'
-
-test_expect_success 'git svn mkdirs -r works' '
-	(
-		cd cloned &&
-		rm -r * &&
-		git svn mkdirs -r7 &&
-		for i in a b c d d/e d/e/f "weird file name"
-		do
-			if ! test -d "$i"
-			then
-				echo >&2 "$i does not exist" &&
-				exit 1
-			fi
-		done &&
-
-		if test -d "! !"
-		then
-			echo >&2 "$i should not exist" &&
-			exit 1
-		fi &&
-
-		git svn mkdirs -r8 &&
-		if ! test -d "! !"
-		then
-			echo >&2 "$i not exist" &&
-			exit 1
-		fi
-	)
-'
-
-test_expect_success 'initialize trunk' '
-	for i in trunk trunk/a trunk/"weird file name"
-	do
-		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i"
-	done
-'
-
-test_expect_success 'clone trunk' 'git svn clone -s "$svnrepo" trunk'
-
-test_expect_success 'empty directories in trunk exist' '
-	(
-		cd trunk &&
-		for i in a "weird file name"
-		do
-			if ! test -d "$i"
-			then
-				echo >&2 "$i does not exist" &&
-				exit 1
-			fi
-		done
-	)
-'
-
-test_expect_success 'remove a top-level directory from svn' '
-	svn_cmd rm -m "remove d" "$svnrepo"/d
-'
-
-test_expect_success 'removed top-level directory does not exist' '
-	git svn clone "$svnrepo" removed &&
-	test ! -e removed/d
-
-'
-unhandled=.git/svn/refs/remotes/git-svn/unhandled.log
-test_expect_success 'git svn gc-ed files work' '
-	(
-		cd removed &&
-		git svn gc &&
-		: Compress::Zlib may not be available &&
-		if test -f "$unhandled".gz
-		then
-			svn_cmd mkdir -m gz "$svnrepo"/gz &&
-			git reset --hard $(git rev-list HEAD | tail -1) &&
-			git svn rebase &&
-			test -f "$unhandled".gz &&
-			test -f "$unhandled" &&
-			for i in a b c "weird file name" gz "! !"
-			do
-				if ! test -d "$i"
-				then
-					echo >&2 "$i does not exist" &&
-					exit 1
-				fi
-			done
-		fi
-	)
-'
-
-test_done
-- 
cgit 1.4.1