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/t3413-rebase-hook.sh | 142 ---------------------------------
 1 file changed, 142 deletions(-)
 delete mode 100755 third_party/git/t/t3413-rebase-hook.sh

(limited to 'third_party/git/t/t3413-rebase-hook.sh')

diff --git a/third_party/git/t/t3413-rebase-hook.sh b/third_party/git/t/t3413-rebase-hook.sh
deleted file mode 100755
index b6833e9a5fea..000000000000
--- a/third_party/git/t/t3413-rebase-hook.sh
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/sh
-
-test_description='git rebase with its hook(s)'
-
-. ./test-lib.sh
-
-test_expect_success setup '
-	echo hello >file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	echo goodbye >file &&
-	git add file &&
-	test_tick &&
-	git commit -m second &&
-	git checkout -b side HEAD^ &&
-	echo world >git &&
-	git add git &&
-	test_tick &&
-	git commit -m side &&
-	git checkout master &&
-	git log --pretty=oneline --abbrev-commit --graph --all &&
-	git branch test side
-'
-
-test_expect_success 'rebase' '
-	git checkout test &&
-	git reset --hard side &&
-	git rebase master &&
-	test "z$(cat git)" = zworld
-'
-
-test_expect_success 'rebase -i' '
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase -i master &&
-	test "z$(cat git)" = zworld
-'
-
-test_expect_success 'setup pre-rebase hook' '
-	mkdir -p .git/hooks &&
-	cat >.git/hooks/pre-rebase <<EOF &&
-#!$SHELL_PATH
-echo "\$1,\$2" >.git/PRE-REBASE-INPUT
-EOF
-	chmod +x .git/hooks/pre-rebase
-'
-
-test_expect_success 'pre-rebase hook gets correct input (1)' '
-	git checkout test &&
-	git reset --hard side &&
-	git rebase master &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,
-
-'
-
-test_expect_success 'pre-rebase hook gets correct input (2)' '
-	git checkout test &&
-	git reset --hard side &&
-	git rebase master test &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,test
-'
-
-test_expect_success 'pre-rebase hook gets correct input (3)' '
-	git checkout test &&
-	git reset --hard side &&
-	git checkout master &&
-	git rebase master test &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,test
-'
-
-test_expect_success 'pre-rebase hook gets correct input (4)' '
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase -i master &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,
-
-'
-
-test_expect_success 'pre-rebase hook gets correct input (5)' '
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase -i master test &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,test
-'
-
-test_expect_success 'pre-rebase hook gets correct input (6)' '
-	git checkout test &&
-	git reset --hard side &&
-	git checkout master &&
-	EDITOR=true git rebase -i master test &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,test
-'
-
-test_expect_success 'setup pre-rebase hook that fails' '
-	mkdir -p .git/hooks &&
-	cat >.git/hooks/pre-rebase <<EOF &&
-#!$SHELL_PATH
-false
-EOF
-	chmod +x .git/hooks/pre-rebase
-'
-
-test_expect_success 'pre-rebase hook stops rebase (1)' '
-	git checkout test &&
-	git reset --hard side &&
-	test_must_fail git rebase master &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
-	test 0 = $(git rev-list HEAD...side | wc -l)
-'
-
-test_expect_success 'pre-rebase hook stops rebase (2)' '
-	git checkout test &&
-	git reset --hard side &&
-	test_must_fail env EDITOR=: git rebase -i master &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
-	test 0 = $(git rev-list HEAD...side | wc -l)
-'
-
-test_expect_success 'rebase --no-verify overrides pre-rebase (1)' '
-	git checkout test &&
-	git reset --hard side &&
-	git rebase --no-verify master &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
-	test "z$(cat git)" = zworld
-'
-
-test_expect_success 'rebase --no-verify overrides pre-rebase (2)' '
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase --no-verify -i master &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
-	test "z$(cat git)" = zworld
-'
-
-test_done
-- 
cgit 1.4.1