about summary refs log tree commit diff
path: root/third_party/git/t/t9834-git-p4-file-dir-bug.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/t9834-git-p4-file-dir-bug.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/t9834-git-p4-file-dir-bug.sh')
-rwxr-xr-xthird_party/git/t/t9834-git-p4-file-dir-bug.sh70
1 files changed, 0 insertions, 70 deletions
diff --git a/third_party/git/t/t9834-git-p4-file-dir-bug.sh b/third_party/git/t/t9834-git-p4-file-dir-bug.sh
deleted file mode 100755
index dac67e89d7d7..000000000000
--- a/third_party/git/t/t9834-git-p4-file-dir-bug.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-
-test_description='git p4 directory/file bug handling
-
-This test creates files and directories with the same name in perforce and
-checks that git-p4 recovers from the error at the same time as the perforce
-repository.'
-
-. ./lib-git-p4.sh
-
-test_expect_success 'start p4d' '
-	start_p4d &&
-	{ p4 configure set submit.collision.check=0 || :; }
-'
-
-test_expect_success 'init depot' '
-	(
-		cd "$cli" &&
-
-		touch add_file_add_dir_del_file add_file_add_dir_del_dir &&
-		p4 add add_file_add_dir_del_file add_file_add_dir_del_dir &&
-		mkdir add_dir_add_file_del_file add_dir_add_file_del_dir &&
-		touch add_dir_add_file_del_file/file add_dir_add_file_del_dir/file &&
-		p4 add add_dir_add_file_del_file/file add_dir_add_file_del_dir/file &&
-		p4 submit -d "add initial" &&
-
-		rm -f add_file_add_dir_del_file add_file_add_dir_del_dir &&
-		mkdir add_file_add_dir_del_file add_file_add_dir_del_dir &&
-		touch add_file_add_dir_del_file/file add_file_add_dir_del_dir/file &&
-		p4 add add_file_add_dir_del_file/file add_file_add_dir_del_dir/file &&
-		rm -rf add_dir_add_file_del_file add_dir_add_file_del_dir &&
-		touch add_dir_add_file_del_file add_dir_add_file_del_dir &&
-		p4 add add_dir_add_file_del_file add_dir_add_file_del_dir &&
-		p4 submit -d "add conflicting" &&
-
-		p4 delete -k add_file_add_dir_del_file &&
-		p4 delete -k add_file_add_dir_del_dir/file &&
-		p4 delete -k add_dir_add_file_del_file &&
-		p4 delete -k add_dir_add_file_del_dir/file &&
-		p4 submit -d "delete conflicting" &&
-
-		p4 delete -k "add_file_add_dir_del_file/file" &&
-		p4 delete -k "add_file_add_dir_del_dir" &&
-		p4 delete -k "add_dir_add_file_del_file/file" &&
-		p4 delete -k "add_dir_add_file_del_dir" &&
-		p4 submit -d "delete remaining"
-	)
-'
-
-test_expect_success 'clone with git-p4' '
-	git p4 clone --dest="$git" //depot/@1,3
-'
-
-test_expect_success 'check contents' '
-	test_path_is_dir "$git/add_file_add_dir_del_file" &&
-	test_path_is_file "$git/add_file_add_dir_del_dir" &&
-	test_path_is_dir "$git/add_dir_add_file_del_file" &&
-	test_path_is_file "$git/add_dir_add_file_del_dir"
-'
-
-test_expect_success 'rebase and check empty' '
-	git -C "$git" p4 rebase &&
-
-	test_path_is_missing "$git/add_file_add_dir_del_file" &&
-	test_path_is_missing "$git/add_file_add_dir_del_dir" &&
-	test_path_is_missing "$git/add_dir_add_file_del_file" &&
-	test_path_is_missing "$git/add_dir_add_file_del_dir"
-'
-
-test_done