diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t5411/test-0012-no-hook-error--porcelain.sh | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (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-0012-no-hook-error--porcelain.sh')
-rw-r--r-- | third_party/git/t/t5411/test-0012-no-hook-error--porcelain.sh | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/third_party/git/t/t5411/test-0012-no-hook-error--porcelain.sh b/third_party/git/t/t5411/test-0012-no-hook-error--porcelain.sh deleted file mode 100644 index 4814f74dc21f..000000000000 --- a/third_party/git/t/t5411/test-0012-no-hook-error--porcelain.sh +++ /dev/null @@ -1,66 +0,0 @@ -# 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: no hook, fail to push special ref ($PROTOCOL/porcelain)" ' - test_must_fail git -C workbench push --porcelain origin \ - HEAD:next \ - 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/heads/next - remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic - remote: error: cannot find hook "proc-receive" - remote: # post-receive hook - remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next - To <URL/of/upstream.git> - * HEAD:refs/heads/next [new branch] - ! HEAD:refs/for/master/topic [remote rejected] (fail to run proc-receive hook) - Done - 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 - <COMMIT-A> 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 -' - -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git push --atomic: (B) next(A) refs/for/master/topic(A) -test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCOL/porcelain)" ' - test_must_fail git -C workbench push --porcelain --atomic origin \ - $B:master \ - HEAD:next \ - 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< <COMMIT-A> <COMMIT-B> refs/heads/master - remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next - remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/master/topic - remote: error: cannot find hook "proc-receive" - To <URL/of/upstream.git> - ! <COMMIT-B>:refs/heads/master [remote rejected] (fail to run proc-receive hook) - ! HEAD:refs/heads/next [remote rejected] (fail to run proc-receive hook) - ! HEAD:refs/for/master/topic [remote rejected] (fail to run proc-receive hook) - Done - 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 -' |