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/interop/i5700-protocol-transition.sh | 68 ---------------------- 1 file changed, 68 deletions(-) delete mode 100755 third_party/git/t/interop/i5700-protocol-transition.sh (limited to 'third_party/git/t/interop/i5700-protocol-transition.sh') diff --git a/third_party/git/t/interop/i5700-protocol-transition.sh b/third_party/git/t/interop/i5700-protocol-transition.sh deleted file mode 100755 index 97e8e580efeb..000000000000 --- a/third_party/git/t/interop/i5700-protocol-transition.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh - -VERSION_A=. -VERSION_B=v2.0.0 - -: ${LIB_GIT_DAEMON_PORT:=5700} -LIB_GIT_DAEMON_COMMAND='git.b daemon' - -test_description='clone and fetch by client who is trying to use a new protocol' -. ./interop-lib.sh -. "$TEST_DIRECTORY"/lib-git-daemon.sh - -start_git_daemon --export-all - -repo=$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo - -test_expect_success "create repo served by $VERSION_B" ' - git.b init "$repo" && - git.b -C "$repo" commit --allow-empty -m one -' - -test_expect_success "git:// clone with $VERSION_A and protocol v1" ' - GIT_TRACE_PACKET=1 git.a -c protocol.version=1 clone "$GIT_DAEMON_URL/repo" child 2>log && - git.a -C child log -1 --format=%s >actual && - git.b -C "$repo" log -1 --format=%s >expect && - test_cmp expect actual && - grep "version=1" log -' - -test_expect_success "git:// fetch with $VERSION_A and protocol v1" ' - git.b -C "$repo" commit --allow-empty -m two && - git.b -C "$repo" log -1 --format=%s >expect && - - GIT_TRACE_PACKET=1 git.a -C child -c protocol.version=1 fetch 2>log && - git.a -C child log -1 --format=%s FETCH_HEAD >actual && - - test_cmp expect actual && - grep "version=1" log && - ! grep "version 1" log -' - -stop_git_daemon - -test_expect_success "create repo served by $VERSION_B" ' - git.b init parent && - git.b -C parent commit --allow-empty -m one -' - -test_expect_success "file:// clone with $VERSION_A and protocol v1" ' - GIT_TRACE_PACKET=1 git.a -c protocol.version=1 clone --upload-pack="git.b upload-pack" parent child2 2>log && - git.a -C child2 log -1 --format=%s >actual && - git.b -C parent log -1 --format=%s >expect && - test_cmp expect actual && - ! grep "version 1" log -' - -test_expect_success "file:// fetch with $VERSION_A and protocol v1" ' - git.b -C parent commit --allow-empty -m two && - git.b -C parent log -1 --format=%s >expect && - - GIT_TRACE_PACKET=1 git.a -C child2 -c protocol.version=1 fetch --upload-pack="git.b upload-pack" 2>log && - git.a -C child2 log -1 --format=%s FETCH_HEAD >actual && - - test_cmp expect actual && - ! grep "version 1" log -' - -test_done -- cgit 1.4.1