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 --- .../t/t5411/test-0014-bad-protocol--porcelain.sh | 160 --------------------- 1 file changed, 160 deletions(-) delete mode 100644 third_party/git/t/t5411/test-0014-bad-protocol--porcelain.sh (limited to 'third_party/git/t/t5411/test-0014-bad-protocol--porcelain.sh') diff --git a/third_party/git/t/t5411/test-0014-bad-protocol--porcelain.sh b/third_party/git/t/t5411/test-0014-bad-protocol--porcelain.sh deleted file mode 100644 index 53b47b018585..000000000000 --- a/third_party/git/t/t5411/test-0014-bad-protocol--porcelain.sh +++ /dev/null @@ -1,160 +0,0 @@ -test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL/porcelain)" ' - write_script "$upstream/hooks/proc-receive" <<-EOF - printf >&2 "# proc-receive hook\n" - test-tool proc-receive -v --version 2 - 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: bad protocol (unknown version, $PROTOCOL/porcelain)" ' - test_must_fail git -C workbench push --porcelain origin \ - HEAD:refs/for/master/topic \ - >out 2>&1 && - make_user_friendly_and_stable_output actual && - - # Check status report for git-push - sed -n \ - -e "/^To / { p; n; p; n; p; }" \ - actual-report && - cat >expect <<-EOF && - To - ! HEAD:refs/for/master/topic [remote rejected] (fail to run proc-receive hook) - Done - EOF - test_cmp expect actual-report && - - # Check error message from "receive-pack", but ignore unstable fatal error - # message ("remote: fatal: the remote end hung up unexpectedly") which - # is different from the remote HTTP server with different locale settings. - grep "^remote: error:" actual-error && - cat >expect <<-EOF && - remote: error: proc-receive version "2" is not supported - EOF - test_cmp expect actual-error && - - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - refs/heads/master - EOF - test_cmp expect actual -' - -test_expect_success "setup proc-receive hook (no report, $PROTOCOL/porcelain)" ' - write_script "$upstream/hooks/proc-receive" <<-EOF - printf >&2 "# proc-receive hook\n" - test-tool proc-receive -v - EOF -' - -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : next(A) refs/for/master/topic(A) -test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL/porcelain)" ' - test_must_fail git -C workbench push --porcelain origin \ - HEAD:refs/heads/next \ - 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/heads/next - remote: pre-receive< refs/for/master/topic - remote: # proc-receive hook - remote: proc-receive< refs/for/master/topic - remote: # post-receive hook - remote: post-receive< refs/heads/next - To - * HEAD:refs/heads/next [new branch] - ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) - Done - EOF - test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - refs/heads/master - refs/heads/next - EOF - test_cmp expect actual -' - -# Refs of upstream : master(A) next(A) -# Refs of workbench: master(A) tags/v123 -test_expect_success "cleanup ($PROTOCOL/porcelain)" ' - git -C "$upstream" update-ref -d refs/heads/next - -' - -test_expect_success "setup proc-receive hook (no ref, $PROTOCOL/porcelain)" ' - write_script "$upstream/hooks/proc-receive" <<-EOF - printf >&2 "# proc-receive hook\n" - test-tool proc-receive -v \ - -r "ok" - EOF -' - -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic -test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" ' - test_must_fail git -C workbench push --porcelain 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 - remote: error: proc-receive reported incomplete status line: "ok" - To - ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) - Done - 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 -' - -test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL/porcelain)" ' - write_script "$upstream/hooks/proc-receive" <<-EOF - printf >&2 "# proc-receive hook\n" - test-tool proc-receive -v \ - -r "xx refs/for/master/topic" - EOF -' - -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push : refs/for/master/topic -test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL/porcelain)" ' - test_must_fail git -C workbench push --porcelain 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> xx refs/for/master/topic - remote: error: proc-receive reported bad status "xx" on ref "refs/for/master/topic" - To - ! HEAD:refs/for/master/topic [remote rejected] (proc-receive failed to report status) - Done - 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