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 --- .../test-0001-standard-git-push--porcelain.sh | 147 --------------------- 1 file changed, 147 deletions(-) delete mode 100644 third_party/git/t/t5411/test-0001-standard-git-push--porcelain.sh (limited to 'third_party/git/t/t5411/test-0001-standard-git-push--porcelain.sh') diff --git a/third_party/git/t/t5411/test-0001-standard-git-push--porcelain.sh b/third_party/git/t/t5411/test-0001-standard-git-push--porcelain.sh deleted file mode 100644 index 48f6fcc84661..000000000000 --- a/third_party/git/t/t5411/test-0001-standard-git-push--porcelain.sh +++ /dev/null @@ -1,147 +0,0 @@ -# Refs of upstream : master(A) -# Refs of workbench: master(A) tags/v123 -# git-push : master(B) next(A) -test_expect_success "git-push ($PROTOCOL/porcelain)" ' - git -C workbench push --porcelain origin \ - $B:refs/heads/master \ - HEAD:refs/heads/next \ - >out 2>&1 && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - remote: # pre-receive hook - remote: pre-receive< refs/heads/master - remote: pre-receive< refs/heads/next - remote: # post-receive hook - remote: post-receive< refs/heads/master - remote: post-receive< refs/heads/next - To - :refs/heads/master .. - * HEAD:refs/heads/next [new branch] - 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(B) next(A) -# Refs of workbench: master(A) tags/v123 -# git-push --atomic: master(A) next(B) -test_expect_success "git-push --atomic ($PROTOCOL/porcelain)" ' - test_must_fail git -C workbench push --atomic --porcelain origin \ - master \ - $B:refs/heads/next \ - >out 2>&1 && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - To - ! refs/heads/master:refs/heads/master [rejected] (non-fast-forward) - ! :refs/heads/next [rejected] (atomic push failed) - 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(B) next(A) -# Refs of workbench: master(A) tags/v123 -# git-push : master(A) next(B) -test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" ' - test_must_fail git \ - -C workbench \ - -c advice.pushUpdateRejected=false \ - push --porcelain origin \ - master \ - $B:refs/heads/next \ - >out 2>&1 && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - remote: # pre-receive hook - remote: pre-receive< refs/heads/next - remote: # post-receive hook - remote: post-receive< refs/heads/next - To - :refs/heads/next .. - ! refs/heads/master:refs/heads/master [rejected] (non-fast-forward) - 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(B) next(B) -# Refs of workbench: master(A) tags/v123 -# git-push -f : master(A) NULL tags/v123 refs/review/master/topic(A) a/b/c(A) -test_expect_success "git-push -f ($PROTOCOL/porcelain)" ' - git -C workbench push --porcelain -f origin \ - refs/tags/v123 \ - :refs/heads/next \ - master \ - master:refs/review/master/topic \ - HEAD:refs/heads/a/b/c \ - >out 2>&1 && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - remote: # pre-receive hook - remote: pre-receive< refs/heads/master - remote: pre-receive< refs/heads/next - remote: pre-receive< refs/tags/v123 - remote: pre-receive< refs/review/master/topic - remote: pre-receive< refs/heads/a/b/c - remote: # post-receive hook - remote: post-receive< refs/heads/master - remote: post-receive< refs/heads/next - remote: post-receive< refs/tags/v123 - remote: post-receive< refs/review/master/topic - remote: post-receive< refs/heads/a/b/c - To - + refs/heads/master:refs/heads/master ... (forced update) - - :refs/heads/next [deleted] - * refs/tags/v123:refs/tags/v123 [new tag] - * refs/heads/master:refs/review/master/topic [new reference] - * HEAD:refs/heads/a/b/c [new branch] - Done - EOF - test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && - refs/heads/a/b/c - refs/heads/master - refs/review/master/topic - refs/tags/v123 - EOF - test_cmp expect actual -' - -# Refs of upstream : master(A) tags/v123 refs/review/master/topic(A) a/b/c(A) -# Refs of workbench: master(A) tags/v123 -test_expect_success "cleanup ($PROTOCOL/porcelain)" ' - ( - cd "$upstream" && - git update-ref -d refs/review/master/topic && - git update-ref -d refs/tags/v123 && - git update-ref -d refs/heads/a/b/c - ) -' -- cgit 1.4.1