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/t7614-merge-signoff.sh | 69 --------------------------------
 1 file changed, 69 deletions(-)
 delete mode 100755 third_party/git/t/t7614-merge-signoff.sh

(limited to 'third_party/git/t/t7614-merge-signoff.sh')

diff --git a/third_party/git/t/t7614-merge-signoff.sh b/third_party/git/t/t7614-merge-signoff.sh
deleted file mode 100755
index c1b8446f491d..000000000000
--- a/third_party/git/t/t7614-merge-signoff.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-test_description='git merge --signoff
-
-This test runs git merge --signoff and makes sure that it works.
-'
-
-. ./test-lib.sh
-
-# Setup test files
-test_setup() {
-	# Expected commit message after merge --signoff
-	cat >expected-signed <<EOF &&
-Merge branch 'master' into other-branch
-
-Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/")
-EOF
-
-	# Expected commit message after merge without --signoff (or with --no-signoff)
-	cat >expected-unsigned <<EOF &&
-Merge branch 'master' into other-branch
-EOF
-
-	# Initial commit and feature branch to merge master into it.
-	git commit --allow-empty -m "Initial empty commit" &&
-	git checkout -b other-branch &&
-	test_commit other-branch file1 1
-}
-
-# Setup repository, files & feature branch
-# This step must be run if You want to test 2,3 or 4
-# Order of 2,3,4 is not important, but 1 must be run before
-# For example `-r 1,4` or `-r 1,4,2 -v` etc
-# But not `-r 2` or `-r 4,3,2,1`
-test_expect_success 'setup' '
-	test_setup
-'
-
-# Test with --signoff flag
-test_expect_success 'git merge --signoff adds a sign-off line' '
-	git checkout master &&
-	test_commit master-branch-2 file2 2 &&
-	git checkout other-branch &&
-	git merge master --signoff --no-edit &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-signed actual
-'
-
-# Test without --signoff flag
-test_expect_success 'git merge does not add a sign-off line' '
-	git checkout master &&
-	test_commit master-branch-3 file3 3 &&
-	git checkout other-branch &&
-	git merge master --no-edit &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-unsigned actual
-'
-
-# Test for --no-signoff flag
-test_expect_success 'git merge --no-signoff flag cancels --signoff flag' '
-	git checkout master &&
-	test_commit master-branch-4 file4 4 &&
-	git checkout other-branch &&
-	git merge master --no-edit --signoff --no-signoff &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-unsigned actual
-'
-
-test_done
-- 
cgit 1.4.1