From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead 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 --- .../git/t/t5411/test-0032-report-with-options.sh | 256 --------------------- 1 file changed, 256 deletions(-) delete mode 100644 third_party/git/t/t5411/test-0032-report-with-options.sh (limited to 'third_party/git/t/t5411/test-0032-report-with-options.sh') diff --git a/third_party/git/t/t5411/test-0032-report-with-options.sh b/third_party/git/t/t5411/test-0032-report-with-options.sh deleted file mode 100644 index b77b78c49f..0000000000 --- a/third_party/git/t/t5411/test-0032-report-with-options.sh +++ /dev/null @@ -1,256 +0,0 @@ -test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL)" ' - write_script "$upstream/hooks/proc-receive" <<-EOF - printf >&2 "# proc-receive hook\n" - test-tool proc-receive -v \ - -r "option refname refs/pull/123/head" \ - -r "option old-oid $B" - EOF -' - -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) -test_expect_success "proc-receive: report option without matching ok ($PROTOCOL)" ' - test_must_fail git -C workbench push origin \ - HEAD:refs/for/master/topic \ - >out 2>&1 && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic - remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> option refname refs/pull/123/head - remote: proc-receive> option old-oid - remote: error: proc-receive reported "option" without a matching "ok/ng" directive - To - ! [remote rejected] HEAD -> refs/for/master/topic (proc-receive failed to report status) - EOF - test_cmp expect actual -' - -test_expect_success "setup proc-receive hook (option refname, $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/pull/123/head" - EOF -' - -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) -test_expect_success "proc-receive: report option refname ($PROTOCOL)" ' - git -C workbench push origin \ - HEAD:refs/for/master/topic \ - >out 2>&1 && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic - remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic - remote: proc-receive> option refname refs/pull/123/head - remote: # post-receive hook - remote: post-receive< refs/pull/123/head - To - * [new reference] HEAD -> refs/pull/123/head - EOF - test_cmp expect actual -' - -test_expect_success "setup proc-receive hook (option refname and forced-update, $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/pull/123/head" \ - -r "option forced-update" - EOF -' -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) -test_expect_success "proc-receive: report option refname and forced-update ($PROTOCOL)" ' - git -C workbench push origin \ - HEAD:refs/for/master/topic \ - >out 2>&1 && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic - remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic - remote: proc-receive> option refname refs/pull/123/head - remote: proc-receive> option forced-update - remote: # post-receive hook - remote: post-receive< refs/pull/123/head - To - * [new reference] HEAD -> refs/pull/123/head - EOF - test_cmp expect actual -' - -test_expect_success "setup proc-receive hook (option refname and old-oid, $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/pull/123/head" \ - -r "option old-oid $B" - EOF -' - -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) -test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL)" ' - git -C workbench push origin \ - HEAD:refs/for/master/topic \ - >out 2>&1 && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic - remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic - remote: proc-receive> option refname refs/pull/123/head - remote: proc-receive> option old-oid - remote: # post-receive hook - remote: post-receive< refs/pull/123/head - To - .. HEAD -> refs/pull/123/head - EOF - test_cmp expect actual -' - -test_expect_success "setup proc-receive hook (option old-oid, $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 $B" - EOF -' - -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) -test_expect_success "proc-receive: report option old-oid ($PROTOCOL)" ' - git -C workbench push origin \ - HEAD:refs/for/master/topic \ - >out 2>&1 && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic - remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic - remote: proc-receive> option old-oid - remote: # post-receive hook - remote: post-receive< refs/for/master/topic - To - .. HEAD -> refs/for/master/topic - EOF - test_cmp expect actual -' - -test_expect_success "setup proc-receive hook (option old-oid and new-oid, $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" - EOF -' - -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) -test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL)" ' - git -C workbench push origin \ - HEAD:refs/for/master/topic \ - >out 2>&1 && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - remote: # pre-receive hook - remote: pre-receive< refs/for/master/topic - remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/master/topic - remote: proc-receive> option old-oid - remote: proc-receive> option new-oid - remote: # post-receive hook - remote: post-receive< refs/for/master/topic - To - .. HEAD -> refs/for/master/topic - EOF - test_cmp expect actual -' - -test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL)" ' - write_script "$upstream/hooks/proc-receive" <<-EOF - printf >&2 "# proc-receive hook\n" - test-tool proc-receive -v \ - -r "ok refs/for/a/b/c/topic" \ - -r "ok refs/for/next/topic" \ - -r "option refname refs/pull/123/head" \ - -r "ok refs/for/master/topic" \ - -r "option refname refs/pull/124/head" \ - -r "option old-oid $B" \ - -r "option forced-update" \ - -r "option new-oid $A" - EOF -' - -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/master/topic(A) -test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL)" ' - git -C workbench push origin \ - HEAD:refs/for/next/topic \ - HEAD:refs/for/a/b/c/topic \ - HEAD:refs/for/master/topic \ - >out 2>&1 && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - remote: # pre-receive hook - remote: pre-receive< refs/for/next/topic - remote: pre-receive< refs/for/a/b/c/topic - remote: pre-receive< refs/for/master/topic - remote: # proc-receive hook - remote: proc-receive< refs/for/next/topic - remote: proc-receive< refs/for/a/b/c/topic - remote: proc-receive< refs/for/master/topic - remote: proc-receive> ok refs/for/a/b/c/topic - remote: proc-receive> ok refs/for/next/topic - remote: proc-receive> option refname refs/pull/123/head - remote: proc-receive> ok refs/for/master/topic - remote: proc-receive> option refname refs/pull/124/head - remote: proc-receive> option old-oid - remote: proc-receive> option forced-update - remote: proc-receive> option new-oid - remote: # post-receive hook - remote: post-receive< refs/pull/123/head - remote: post-receive< refs/for/a/b/c/topic - remote: post-receive< refs/pull/124/head - To - * [new reference] HEAD -> refs/pull/123/head - * [new reference] HEAD -> refs/for/a/b/c/topic - + ... HEAD -> refs/pull/124/head (forced update) - EOF - test_cmp expect actual && - - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - refs/heads/master - EOF - test_cmp expect actual -' -- cgit 1.4.1