about summary refs log tree commit diff
path: root/third_party/git/t/t9147-git-svn-include-paths.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/t9147-git-svn-include-paths.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/t9147-git-svn-include-paths.sh')
-rwxr-xr-xthird_party/git/t/t9147-git-svn-include-paths.sh149
1 files changed, 0 insertions, 149 deletions
diff --git a/third_party/git/t/t9147-git-svn-include-paths.sh b/third_party/git/t/t9147-git-svn-include-paths.sh
deleted file mode 100755
index d292bf9f55..0000000000
--- a/third_party/git/t/t9147-git-svn-include-paths.sh
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2013 Paul Walmsley - based on t9134 by Vitaly Shukela
-#
-
-test_description='git svn property tests'
-. ./lib-git-svn.sh
-
-test_expect_success 'setup test repository' '
-	svn_cmd co "$svnrepo" s &&
-	(
-		cd s &&
-		mkdir qqq www xxx &&
-		echo test_qqq > qqq/test_qqq.txt &&
-		echo test_www > www/test_www.txt &&
-		echo test_xxx > xxx/test_xxx.txt &&
-		svn_cmd add qqq &&
-		svn_cmd add www &&
-		svn_cmd add xxx &&
-		svn_cmd commit -m "create some files" &&
-		svn_cmd up &&
-		echo hi >> www/test_www.txt &&
-		svn_cmd commit -m "modify www/test_www.txt" &&
-		svn_cmd up
-	)
-'
-
-test_expect_success 'clone an SVN repository with filter to include qqq directory' '
-	git svn clone --include-paths="qqq" "$svnrepo" g &&
-	echo test_qqq > expect &&
-	for i in g/*/*.txt; do cat $i >> expect2; done &&
-	test_cmp expect expect2
-'
-
-
-test_expect_success 'init+fetch an SVN repository with included qqq directory' '
-	git svn init "$svnrepo" c &&
-	( cd c && git svn fetch --include-paths="qqq" ) &&
-	rm expect2 &&
-	echo test_qqq > expect &&
-	for i in c/*/*.txt; do cat $i >> expect2; done &&
-	test_cmp expect expect2
-'
-
-test_expect_success 'verify include-paths config saved by clone' '
-	(
-	    cd g &&
-	    git config --get svn-remote.svn.include-paths | fgrep "qqq"
-	)
-'
-
-test_expect_success 'SVN-side change outside of www' '
-	(
-		cd s &&
-		echo b >> qqq/test_qqq.txt &&
-		svn_cmd commit -m "SVN-side change outside of www" &&
-		svn_cmd up &&
-		svn_cmd log -v | fgrep "SVN-side change outside of www"
-	)
-'
-
-test_expect_success 'update git svn-cloned repo (config include)' '
-	(
-		cd g &&
-		git svn rebase &&
-		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-'
-
-test_expect_success 'update git svn-cloned repo (option include)' '
-	(
-		cd c &&
-		git svn rebase --include-paths="qqq" &&
-		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-'
-
-test_expect_success 'SVN-side change inside of ignored www' '
-	(
-		cd s &&
-		echo zaq >> www/test_www.txt &&
-		svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
-		svn_cmd up &&
-		svn_cmd log -v | fgrep "SVN-side change inside of www/test_www.txt"
-	)
-'
-
-test_expect_success 'update git svn-cloned repo (config include)' '
-	(
-		cd g &&
-		git svn rebase &&
-		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-'
-
-test_expect_success 'update git svn-cloned repo (option include)' '
-	(
-		cd c &&
-		git svn rebase --include-paths="qqq" &&
-		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-'
-
-test_expect_success 'SVN-side change in and out of included qqq' '
-	(
-		cd s &&
-		echo cvf >> www/test_www.txt &&
-		echo ygg >> qqq/test_qqq.txt &&
-		svn_cmd commit -m "SVN-side change in and out of ignored www" &&
-		svn_cmd up &&
-		svn_cmd log -v | fgrep "SVN-side change in and out of ignored www"
-	)
-'
-
-test_expect_success 'update git svn-cloned repo again (config include)' '
-	(
-		cd g &&
-		git svn rebase &&
-		printf "test_qqq\nb\nygg\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-'
-
-test_expect_success 'update git svn-cloned repo again (option include)' '
-	(
-		cd c &&
-		git svn rebase --include-paths="qqq" &&
-		printf "test_qqq\nb\nygg\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-'
-
-test_done