about summary refs log tree commit diff
path: root/third_party/git/t/t9816-git-p4-locked.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/t9816-git-p4-locked.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/t9816-git-p4-locked.sh')
-rwxr-xr-xthird_party/git/t/t9816-git-p4-locked.sh141
1 files changed, 0 insertions, 141 deletions
diff --git a/third_party/git/t/t9816-git-p4-locked.sh b/third_party/git/t/t9816-git-p4-locked.sh
deleted file mode 100755
index 932841003cfc..000000000000
--- a/third_party/git/t/t9816-git-p4-locked.sh
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/sh
-
-test_description='git p4 locked file behavior'
-
-. ./lib-git-p4.sh
-
-test_expect_success 'start p4d' '
-	start_p4d
-'
-
-# See
-# http://www.perforce.com/perforce/doc.current/manuals/p4sag/03_superuser.html#1088563
-# for suggestions on how to configure "sitewide pessimistic locking"
-# where only one person can have a file open for edit at a time.
-test_expect_success 'init depot' '
-	(
-		cd "$cli" &&
-		echo "TypeMap: +l //depot/..." | p4 typemap -i &&
-		echo file1 >file1 &&
-		p4 add file1 &&
-		p4 submit -d "add file1"
-	)
-'
-
-test_expect_success 'edit with lock not taken' '
-	test_when_finished cleanup_git &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		echo line2 >>file1 &&
-		git add file1 &&
-		git commit -m "line2 in file1" &&
-		git config git-p4.skipSubmitEdit true &&
-		git p4 submit
-	)
-'
-
-test_expect_success 'add with lock not taken' '
-	test_when_finished cleanup_git &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		echo line1 >>add-lock-not-taken &&
-		git add add-lock-not-taken &&
-		git commit -m "add add-lock-not-taken" &&
-		git config git-p4.skipSubmitEdit true &&
-		git p4 submit --verbose
-	)
-'
-
-lock_in_another_client() {
-	# build a different client
-	cli2="$TRASH_DIRECTORY/cli2" &&
-	mkdir -p "$cli2" &&
-	test_when_finished "p4 client -f -d client2 && rm -rf \"$cli2\"" &&
-	(
-		cd "$cli2" &&
-		P4CLIENT=client2 &&
-		cli="$cli2" &&
-		client_view "//depot/... //client2/..." &&
-		p4 sync &&
-		p4 open file1
-	)
-}
-
-test_expect_failure 'edit with lock taken' '
-	lock_in_another_client &&
-	test_when_finished cleanup_git &&
-	test_when_finished "cd \"$cli\" && p4 sync -f file1" &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		echo line3 >>file1 &&
-		git add file1 &&
-		git commit -m "line3 in file1" &&
-		git config git-p4.skipSubmitEdit true &&
-		git p4 submit --verbose
-	)
-'
-
-test_expect_failure 'delete with lock taken' '
-	lock_in_another_client &&
-	test_when_finished cleanup_git &&
-	test_when_finished "cd \"$cli\" && p4 sync -f file1" &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		git rm file1 &&
-		git commit -m "delete file1" &&
-		git config git-p4.skipSubmitEdit true &&
-		git p4 submit --verbose
-	)
-'
-
-test_expect_failure 'chmod with lock taken' '
-	lock_in_another_client &&
-	test_when_finished cleanup_git &&
-	test_when_finished "cd \"$cli\" && p4 sync -f file1" &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		chmod +x file1 &&
-		git add file1 &&
-		git commit -m "chmod +x file1" &&
-		git config git-p4.skipSubmitEdit true &&
-		git p4 submit --verbose
-	)
-'
-
-test_expect_success 'copy with lock taken' '
-	lock_in_another_client &&
-	test_when_finished cleanup_git &&
-	test_when_finished "cd \"$cli\" && p4 revert file2 && rm -f file2" &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		cp file1 file2 &&
-		git add file2 &&
-		git commit -m "cp file1 to file2" &&
-		git config git-p4.skipSubmitEdit true &&
-		git config git-p4.detectCopies true &&
-		git p4 submit --verbose
-	)
-'
-
-test_expect_failure 'move with lock taken' '
-	lock_in_another_client &&
-	test_when_finished cleanup_git &&
-	test_when_finished "cd \"$cli\" && p4 sync file1 && rm -f file2" &&
-	git p4 clone --dest="$git" //depot &&
-	(
-		cd "$git" &&
-		git mv file1 file3 &&
-		git commit -m "mv file1 to file3" &&
-		git config git-p4.skipSubmitEdit true &&
-		git config git-p4.detectRenames true &&
-		git p4 submit --verbose
-	)
-'
-
-test_done