about summary refs log tree commit diff
path: root/third_party/git/t/t9157-git-svn-fetch-merge.sh
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-21T10·03+0300
committerVincent Ambo <mail@tazj.in>2021-09-21T11·29+0300
commit43b1791ec601732ac31195df96781a848360a9ac (patch)
treedaae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t9157-git-svn-fetch-merge.sh
parent2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff)
chore(3p/git): Unvendor git and track patches instead r/2903
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
Diffstat (limited to 'third_party/git/t/t9157-git-svn-fetch-merge.sh')
-rwxr-xr-xthird_party/git/t/t9157-git-svn-fetch-merge.sh58
1 files changed, 0 insertions, 58 deletions
diff --git a/third_party/git/t/t9157-git-svn-fetch-merge.sh b/third_party/git/t/t9157-git-svn-fetch-merge.sh
deleted file mode 100755
index 991d2aa1be63..000000000000
--- a/third_party/git/t/t9157-git-svn-fetch-merge.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2010 Steven Walter
-#
-
-test_description='git svn merge detection'
-. ./lib-git-svn.sh
-
-svn_ver="$(svn --version --quiet)"
-case $svn_ver in
-0.* | 1.[0-4].*)
-	skip_all="skipping git-svn test - SVN too old ($svn_ver)"
-	test_done
-	;;
-esac
-
-test_expect_success 'initialize source svn repo' '
-	svn_cmd mkdir -m x "$svnrepo"/trunk &&
-	svn_cmd mkdir -m x "$svnrepo"/branches &&
-	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
-	(
-		cd "$SVN_TREE" &&
-		touch foo &&
-		svn add foo &&
-		svn commit -m "initial commit" &&
-		svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
-		touch bar &&
-		svn add bar &&
-		svn commit -m x &&
-		svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch2 &&
-		svn switch "$svnrepo"/branches/branch1 &&
-		touch baz &&
-		svn add baz &&
-		svn commit -m x &&
-		svn switch "$svnrepo"/trunk &&
-		svn merge "$svnrepo"/branches/branch1 &&
-		svn commit -m "merge" &&
-		svn switch "$svnrepo"/branches/branch1 &&
-		svn commit -m x &&
-		svn switch "$svnrepo"/branches/branch2 &&
-		svn merge "$svnrepo"/branches/branch1 &&
-		svn commit -m "merge branch1" &&
-		svn switch "$svnrepo"/trunk &&
-		svn merge "$svnrepo"/branches/branch2 &&
-		svn resolved baz &&
-		svn commit -m "merge branch2"
-	) &&
-	rm -rf "$SVN_TREE"
-'
-
-test_expect_success 'clone svn repo' '
-	git svn init -s "$svnrepo" &&
-	git svn fetch
-'
-
-test_expect_success 'verify merge commit' 'git rev-parse HEAD^2'
-
-test_done