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 --- third_party/git/t/t5802-connect-helper.sh | 101 ------------------------------ 1 file changed, 101 deletions(-) delete mode 100755 third_party/git/t/t5802-connect-helper.sh (limited to 'third_party/git/t/t5802-connect-helper.sh') diff --git a/third_party/git/t/t5802-connect-helper.sh b/third_party/git/t/t5802-connect-helper.sh deleted file mode 100755 index c6c2661878c0..000000000000 --- a/third_party/git/t/t5802-connect-helper.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -test_description='ext::cmd remote "connect" helper' -. ./test-lib.sh - -test_expect_success setup ' - git config --global protocol.ext.allow user && - test_tick && - git commit --allow-empty -m initial && - test_tick && - git commit --allow-empty -m second && - test_tick && - git commit --allow-empty -m third && - test_tick && - git tag -a -m "tip three" three && - - test_tick && - git commit --allow-empty -m fourth -' - -test_expect_success clone ' - cmd=$(echo "echo >&2 ext::sh invoked && %S .." | sed -e "s/ /% /g") && - git clone "ext::sh -c %S% ." dst && - git for-each-ref refs/heads/ refs/tags/ >expect && - ( - cd dst && - git config remote.origin.url "ext::sh -c $cmd" && - git for-each-ref refs/heads/ refs/tags/ - ) >actual && - test_cmp expect actual -' - -test_expect_success 'update following tag' ' - test_tick && - git commit --allow-empty -m fifth && - test_tick && - git tag -a -m "tip five" five && - git for-each-ref refs/heads/ refs/tags/ >expect && - ( - cd dst && - git pull && - git for-each-ref refs/heads/ refs/tags/ >../actual - ) && - test_cmp expect actual -' - -test_expect_success 'update backfilled tag' ' - test_tick && - git commit --allow-empty -m sixth && - test_tick && - git tag -a -m "tip two" two three^1 && - git for-each-ref refs/heads/ refs/tags/ >expect && - ( - cd dst && - git pull && - git for-each-ref refs/heads/ refs/tags/ >../actual - ) && - test_cmp expect actual -' - -test_expect_success 'update backfilled tag without primary transfer' ' - test_tick && - git tag -a -m "tip one " one two^1 && - git for-each-ref refs/heads/ refs/tags/ >expect && - ( - cd dst && - git pull && - git for-each-ref refs/heads/ refs/tags/ >../actual - ) && - test_cmp expect actual -' - - -test_expect_success 'set up fake git-daemon' ' - mkdir remote && - git init --bare remote/one.git && - mkdir remote/host && - git init --bare remote/host/two.git && - write_script fake-daemon <<-\EOF && - git daemon --inetd \ - --informative-errors \ - --export-all \ - --base-path="$TRASH_DIRECTORY/remote" \ - --interpolated-path="$TRASH_DIRECTORY/remote/%H%D" \ - "$TRASH_DIRECTORY/remote" - EOF - export TRASH_DIRECTORY && - PATH=$TRASH_DIRECTORY:$PATH -' - -test_expect_success 'ext command can connect to git daemon (no vhost)' ' - rm -rf dst && - git clone "ext::fake-daemon %G/one.git" dst -' - -test_expect_success 'ext command can connect to git daemon (vhost)' ' - rm -rf dst && - git clone "ext::fake-daemon %G/two.git %Vhost" dst -' - -test_done -- cgit 1.4.1