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/t5542-push-http-shallow.sh | 93 ---------------------------- 1 file changed, 93 deletions(-) delete mode 100755 third_party/git/t/t5542-push-http-shallow.sh (limited to 'third_party/git/t/t5542-push-http-shallow.sh') diff --git a/third_party/git/t/t5542-push-http-shallow.sh b/third_party/git/t/t5542-push-http-shallow.sh deleted file mode 100755 index ddc1db722d43..000000000000 --- a/third_party/git/t/t5542-push-http-shallow.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -test_description='push from/to a shallow clone over http' - -. ./test-lib.sh -. "$TEST_DIRECTORY"/lib-httpd.sh -start_httpd - -commit() { - echo "$1" >tracked && - git add tracked && - git commit -m "$1" -} - -test_expect_success 'setup' ' - git config --global transfer.fsckObjects true && - commit 1 && - commit 2 && - commit 3 && - commit 4 && - git clone . full && - ( - git init full-abc && - cd full-abc && - commit a && - commit b && - commit c - ) && - git clone --no-local --depth=2 .git shallow && - git --git-dir=shallow/.git log --format=%s >actual && - cat <expect && -4 -3 -EOF - test_cmp expect actual && - git clone --no-local --depth=2 full-abc/.git shallow2 && - git --git-dir=shallow2/.git log --format=%s >actual && - cat <expect && -c -b -EOF - test_cmp expect actual -' - -test_expect_success 'push to shallow repo via http' ' - git clone --bare --no-local shallow "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && - ( - cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && - git config http.receivepack true - ) && - ( - cd full && - commit 9 && - git push $HTTPD_URL/smart/repo.git +master:refs/remotes/top/master - ) && - ( - cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && - git fsck && - git log --format=%s top/master >actual && - cat <expect && -9 -4 -3 -EOF - test_cmp expect actual - ) -' - -test_expect_success 'push from shallow repo via http' ' - mv "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" shallow-upstream.git && - git clone --bare --no-local full "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && - ( - cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && - git config http.receivepack true - ) && - commit 10 && - git push $HTTPD_URL/smart/repo.git +master:refs/remotes/top/master && - ( - cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && - git fsck && - git log --format=%s top/master >actual && - cat <expect && -10 -4 -3 -2 -1 -EOF - test_cmp expect actual - ) -' - -test_done -- cgit 1.4.1