about summary refs log tree commit diff
path: root/third_party/git/t/t9812-git-p4-wildcards.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/t9812-git-p4-wildcards.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/t9812-git-p4-wildcards.sh')
-rwxr-xr-xthird_party/git/t/t9812-git-p4-wildcards.sh214
1 files changed, 0 insertions, 214 deletions
diff --git a/third_party/git/t/t9812-git-p4-wildcards.sh b/third_party/git/t/t9812-git-p4-wildcards.sh
deleted file mode 100755
index 254a7c244698..000000000000
--- a/third_party/git/t/t9812-git-p4-wildcards.sh
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/bin/sh
-
-test_description='git p4 wildcards'
-
-. ./lib-git-p4.sh
-
-test_expect_success 'start p4d' '
-	start_p4d
-'
-
-test_expect_success 'add p4 files with wildcards in the names' '
-	(
-		cd "$cli" &&
-		printf "file2\nhas\nsome\nrandom\ntext\n" >file2 &&
-		p4 add file2 &&
-		echo file-wild-hash >file-wild#hash &&
-		if test_have_prereq !MINGW,!CYGWIN
-		then
-			echo file-wild-star >file-wild\*star
-		fi &&
-		echo file-wild-at >file-wild@at &&
-		echo file-wild-percent >file-wild%percent &&
-		p4 add -f file-wild* &&
-		p4 submit -d "file wildcards"
-	)
-'
-
-test_expect_success 'wildcard files git p4 clone' '
-	git p4 clone --dest="$git" //depot &&
-	test_when_finished cleanup_git &&
-	(
-		cd "$git" &&
-		test -f file-wild#hash &&
-		if test_have_prereq !MINGW,!CYGWIN
-		then
-			test -f file-wild\*star
-		fi &&
-		test -f file-wild@at &&
-		test -f file-wild%percent
-	)
-'
-
-test_expect_success 'wildcard files submit back to p4, add' '
-	test_when_finished cleanup_git &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		echo git-wild-hash >git-wild#hash &&
-		if test_have_prereq !MINGW,!CYGWIN
-		then
-			echo git-wild-star >git-wild\*star
-		fi &&
-		echo git-wild-at >git-wild@at &&
-		echo git-wild-percent >git-wild%percent &&
-		git add git-wild* &&
-		git commit -m "add some wildcard filenames" &&
-		git config git-p4.skipSubmitEdit true &&
-		git p4 submit
-	) &&
-	(
-		cd "$cli" &&
-		test_path_is_file git-wild#hash &&
-		if test_have_prereq !MINGW,!CYGWIN
-		then
-			test_path_is_file git-wild\*star
-		fi &&
-		test_path_is_file git-wild@at &&
-		test_path_is_file git-wild%percent
-	)
-'
-
-test_expect_success 'wildcard files submit back to p4, modify' '
-	test_when_finished cleanup_git &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		echo new-line >>git-wild#hash &&
-		if test_have_prereq !MINGW,!CYGWIN
-		then
-			echo new-line >>git-wild\*star
-		fi &&
-		echo new-line >>git-wild@at &&
-		echo new-line >>git-wild%percent &&
-		git add git-wild* &&
-		git commit -m "modify the wildcard files" &&
-		git config git-p4.skipSubmitEdit true &&
-		git p4 submit
-	) &&
-	(
-		cd "$cli" &&
-		test_line_count = 2 git-wild#hash &&
-		if test_have_prereq !MINGW,!CYGWIN
-		then
-			test_line_count = 2 git-wild\*star
-		fi &&
-		test_line_count = 2 git-wild@at &&
-		test_line_count = 2 git-wild%percent
-	)
-'
-
-test_expect_success 'wildcard files submit back to p4, copy' '
-	test_when_finished cleanup_git &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		cp file2 git-wild-cp#hash &&
-		git add git-wild-cp#hash &&
-		cp git-wild#hash file-wild-3 &&
-		git add file-wild-3 &&
-		git commit -m "wildcard copies" &&
-		git config git-p4.detectCopies true &&
-		git config git-p4.detectCopiesHarder true &&
-		git config git-p4.skipSubmitEdit true &&
-		git p4 submit
-	) &&
-	(
-		cd "$cli" &&
-		test_path_is_file git-wild-cp#hash &&
-		test_path_is_file file-wild-3
-	)
-'
-
-test_expect_success 'wildcard files submit back to p4, rename' '
-	test_when_finished cleanup_git &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		git mv git-wild@at file-wild-4 &&
-		git mv file-wild-3 git-wild-cp%percent &&
-		git commit -m "wildcard renames" &&
-		git config git-p4.detectRenames true &&
-		git config git-p4.skipSubmitEdit true &&
-		git p4 submit
-	) &&
-	(
-		cd "$cli" &&
-		test_path_is_missing git-wild@at &&
-		test_path_is_file git-wild-cp%percent
-	)
-'
-
-test_expect_success 'wildcard files submit back to p4, delete' '
-	test_when_finished cleanup_git &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		git rm git-wild* &&
-		git commit -m "delete the wildcard files" &&
-		git config git-p4.skipSubmitEdit true &&
-		git p4 submit
-	) &&
-	(
-		cd "$cli" &&
-		test_path_is_missing git-wild#hash &&
-		if test_have_prereq !MINGW,!CYGWIN
-		then
-			test_path_is_missing git-wild\*star
-		fi &&
-		test_path_is_missing git-wild@at &&
-		test_path_is_missing git-wild%percent
-	)
-'
-
-test_expect_success 'p4 deleted a wildcard file' '
-	(
-		cd "$cli" &&
-		echo "wild delete test" >wild@delete &&
-		p4 add -f wild@delete &&
-		p4 submit -d "add wild@delete"
-	) &&
-	test_when_finished cleanup_git &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		test_path_is_file wild@delete
-	) &&
-	(
-		cd "$cli" &&
-		# must use its encoded name
-		p4 delete wild%40delete &&
-		p4 submit -d "delete wild@delete"
-	) &&
-	(
-		cd "$git" &&
-		git p4 sync &&
-		git merge --ff-only p4/master &&
-		test_path_is_missing wild@delete
-	)
-'
-
-test_expect_success 'wildcard files requiring keyword scrub' '
-	(
-		cd "$cli" &&
-		cat <<-\EOF >scrub@wild &&
-		$Id$
-		line2
-		EOF
-		p4 add -t text+k -f scrub@wild &&
-		p4 submit -d "scrub at wild"
-	) &&
-	test_when_finished cleanup_git &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		git config git-p4.skipSubmitEdit true &&
-		git config git-p4.attemptRCSCleanup true &&
-		sed "s/^line2/line2 edit/" <scrub@wild >scrub@wild.tmp &&
-		mv -f scrub@wild.tmp scrub@wild &&
-		git commit -m "scrub at wild line2 edit" scrub@wild &&
-		git p4 submit
-	)
-'
-
-test_done