about summary refs log tree commit diff
path: root/third_party/git/t/t5411/test-0036-report-multi-rewrite-for-one-ref.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/t5411/test-0036-report-multi-rewrite-for-one-ref.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/t5411/test-0036-report-multi-rewrite-for-one-ref.sh')
-rw-r--r--third_party/git/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh227
1 files changed, 0 insertions, 227 deletions
diff --git a/third_party/git/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh b/third_party/git/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
deleted file mode 100644
index 73283d81e8a3..000000000000
--- a/third_party/git/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
+++ /dev/null
@@ -1,227 +0,0 @@
-test_expect_success "setup git config for remote-tracking of special refs" '
-	(
-		cd workbench &&
-		if ! git config --get-all remote.origin.fetch | grep refs/for/
-		then
-			git config --add remote.origin.fetch \
-				"+refs/for/*:refs/t/for/*" &&
-			git config --add remote.origin.fetch \
-				"+refs/pull/*:refs/t/pull/*" &&
-			git config --add remote.origin.fetch \
-				"+refs/changes/*:refs/t/changes/*"
-		fi
-	)
-'
-
-test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, $PROTOCOL)" '
-	write_script "$upstream/hooks/proc-receive" <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/master/topic" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B" \
-		-r "ok refs/for/master/topic" \
-		-r "option refname refs/changes/24/124/1" \
-		-r "option old-oid $ZERO_OID" \
-		-r "option new-oid $A" \
-		-r "ok refs/for/master/topic" \
-		-r "option refname refs/changes/25/125/1" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B"
-	EOF
-'
-
-# Refs of upstream : master(A)
-# Refs of workbench: master(A)  tags/v123
-# git push         :                       refs/for/master/topic(A)
-test_expect_success "proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite ($PROTOCOL)" '
-	git -C workbench push origin \
-		HEAD:refs/for/master/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	remote: # pre-receive hook
-	remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
-	remote: # proc-receive hook
-	remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
-	remote: proc-receive> ok refs/for/master/topic
-	remote: proc-receive> option old-oid <COMMIT-A>
-	remote: proc-receive> option new-oid <COMMIT-B>
-	remote: proc-receive> ok refs/for/master/topic
-	remote: proc-receive> option refname refs/changes/24/124/1
-	remote: proc-receive> option old-oid <ZERO-OID>
-	remote: proc-receive> option new-oid <COMMIT-A>
-	remote: proc-receive> ok refs/for/master/topic
-	remote: proc-receive> option refname refs/changes/25/125/1
-	remote: proc-receive> option old-oid <COMMIT-A>
-	remote: proc-receive> option new-oid <COMMIT-B>
-	remote: # post-receive hook
-	remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic
-	remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1
-	remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/25/125/1
-	To <URL/of/upstream.git>
-	 <OID-A>..<OID-B> HEAD -> refs/for/master/topic
-	 * [new reference] HEAD -> refs/changes/24/124/1
-	 <OID-A>..<OID-B> HEAD -> refs/changes/25/125/1
-	EOF
-	test_cmp expect actual &&
-	git -C "$upstream" show-ref >out &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	<COMMIT-A> refs/heads/master
-	EOF
-	test_cmp expect actual
-'
-
-test_expect_success "proc-receive: check remote-tracking #1 ($PROTOCOL)" '
-	git -C workbench show-ref |
-		grep -v -e refs/remotes -e refs/heads -e refs/tags >out &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	<COMMIT-A> refs/t/changes/24/124/1
-	<COMMIT-B> refs/t/changes/25/125/1
-	<COMMIT-B> refs/t/for/master/topic
-	EOF
-	test_cmp expect actual &&
-	git -C workbench update-ref -d refs/t/for/master/topic &&
-	git -C workbench update-ref -d refs/t/changes/24/124/1 &&
-	git -C workbench update-ref -d refs/t/changes/25/125/1
-'
-
-test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL)" '
-	write_script "$upstream/hooks/proc-receive" <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/master/topic" \
-		-r "option refname refs/changes/24/124/1" \
-		-r "option old-oid $ZERO_OID" \
-		-r "option new-oid $A" \
-		-r "ok refs/for/master/topic" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B" \
-		-r "ok refs/for/master/topic" \
-		-r "option refname refs/changes/25/125/1" \
-		-r "option old-oid $B" \
-		-r "option new-oid $A" \
-		-r "option forced-update"
-	EOF
-'
-
-# Refs of upstream : master(A)
-# Refs of workbench: master(A)  tags/v123
-# git push         :                       refs/for/master/topic(A)
-test_expect_success "proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite ($PROTOCOL)" '
-	git -C workbench push origin \
-		HEAD:refs/for/master/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	remote: # pre-receive hook
-	remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
-	remote: # proc-receive hook
-	remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
-	remote: proc-receive> ok refs/for/master/topic
-	remote: proc-receive> option refname refs/changes/24/124/1
-	remote: proc-receive> option old-oid <ZERO-OID>
-	remote: proc-receive> option new-oid <COMMIT-A>
-	remote: proc-receive> ok refs/for/master/topic
-	remote: proc-receive> option old-oid <COMMIT-A>
-	remote: proc-receive> option new-oid <COMMIT-B>
-	remote: proc-receive> ok refs/for/master/topic
-	remote: proc-receive> option refname refs/changes/25/125/1
-	remote: proc-receive> option old-oid <COMMIT-B>
-	remote: proc-receive> option new-oid <COMMIT-A>
-	remote: proc-receive> option forced-update
-	remote: # post-receive hook
-	remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1
-	remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/master/topic
-	remote: post-receive< <COMMIT-B> <COMMIT-A> refs/changes/25/125/1
-	To <URL/of/upstream.git>
-	 * [new reference] HEAD -> refs/changes/24/124/1
-	 <OID-A>..<OID-B> HEAD -> refs/for/master/topic
-	 + <OID-B>...<OID-A> HEAD -> refs/changes/25/125/1 (forced update)
-	EOF
-	test_cmp expect actual &&
-	git -C "$upstream" show-ref >out &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	<COMMIT-A> refs/heads/master
-	EOF
-	test_cmp expect actual
-'
-
-test_expect_success "proc-receive: check remote-tracking #2 ($PROTOCOL)" '
-	git -C workbench show-ref |
-		grep -v -e refs/remotes -e refs/heads -e refs/tags >out &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	<COMMIT-A> refs/t/changes/24/124/1
-	<COMMIT-A> refs/t/changes/25/125/1
-	<COMMIT-B> refs/t/for/master/topic
-	EOF
-	test_cmp expect actual &&
-	git -C workbench update-ref -d refs/t/for/master/topic &&
-	git -C workbench update-ref -d refs/t/changes/24/124/1 &&
-	git -C workbench update-ref -d refs/t/changes/25/125/1
-'
-
-test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL)" '
-	write_script "$upstream/hooks/proc-receive" <<-EOF
-	printf >&2 "# proc-receive hook\n"
-	test-tool proc-receive -v \
-		-r "ok refs/for/master/topic" \
-		-r "option refname refs/changes/23/123/1" \
-		-r "ok refs/for/master/topic" \
-		-r "option refname refs/changes/24/124/2" \
-		-r "option old-oid $A" \
-		-r "option new-oid $B"
-	EOF
-'
-
-# Refs of upstream : master(A)
-# Refs of workbench: master(A)  tags/v123
-# git push         :                       refs/for/master/topic(A)
-test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL)" '
-	git -C workbench push origin \
-		HEAD:refs/for/master/topic \
-		>out 2>&1 &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	remote: # pre-receive hook
-	remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
-	remote: # proc-receive hook
-	remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic
-	remote: proc-receive> ok refs/for/master/topic
-	remote: proc-receive> option refname refs/changes/23/123/1
-	remote: proc-receive> ok refs/for/master/topic
-	remote: proc-receive> option refname refs/changes/24/124/2
-	remote: proc-receive> option old-oid <COMMIT-A>
-	remote: proc-receive> option new-oid <COMMIT-B>
-	remote: # post-receive hook
-	remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/23/123/1
-	remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/24/124/2
-	To <URL/of/upstream.git>
-	 * [new reference] HEAD -> refs/changes/23/123/1
-	 <OID-A>..<OID-B> HEAD -> refs/changes/24/124/2
-	EOF
-	test_cmp expect actual &&
-	git -C "$upstream" show-ref >out &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	<COMMIT-A> refs/heads/master
-	EOF
-	test_cmp expect actual
-'
-
-test_expect_success "proc-receive: check remote-tracking #3 ($PROTOCOL)" '
-	git -C workbench show-ref |
-		grep -v -e refs/remotes -e refs/heads -e refs/tags >out &&
-	make_user_friendly_and_stable_output <out >actual &&
-	cat >expect <<-EOF &&
-	<COMMIT-A> refs/t/changes/23/123/1
-	<COMMIT-B> refs/t/changes/24/124/2
-	EOF
-	test_cmp expect actual &&
-	git -C workbench update-ref -d refs/t/changes/24/124/1 &&
-	git -C workbench update-ref -d refs/t/changes/25/125/2
-'