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/t5533-push-cas.sh | 259 ------------------------------------ 1 file changed, 259 deletions(-) delete mode 100755 third_party/git/t/t5533-push-cas.sh (limited to 'third_party/git/t/t5533-push-cas.sh') diff --git a/third_party/git/t/t5533-push-cas.sh b/third_party/git/t/t5533-push-cas.sh deleted file mode 100755 index 0b0eb1d0259f..000000000000 --- a/third_party/git/t/t5533-push-cas.sh +++ /dev/null @@ -1,259 +0,0 @@ -#!/bin/sh - -test_description='compare & swap push force/delete safety' - -. ./test-lib.sh - -setup_srcdst_basic () { - rm -fr src dst && - git clone --no-local . src && - git clone --no-local src dst && - ( - cd src && git checkout HEAD^0 - ) -} - -test_expect_success setup ' - # create template repository - test_commit A && - test_commit B && - test_commit C -' - -test_expect_success 'push to update (protected)' ' - setup_srcdst_basic && - ( - cd dst && - test_commit D && - test_must_fail git push --force-with-lease=master:master origin master 2>err && - grep "stale info" err - ) && - git ls-remote . refs/heads/master >expect && - git ls-remote src refs/heads/master >actual && - test_cmp expect actual -' - -test_expect_success 'push to update (protected, forced)' ' - setup_srcdst_basic && - ( - cd dst && - test_commit D && - git push --force --force-with-lease=master:master origin master 2>err && - grep "forced update" err - ) && - git ls-remote dst refs/heads/master >expect && - git ls-remote src refs/heads/master >actual && - test_cmp expect actual -' - -test_expect_success 'push to update (protected, tracking)' ' - setup_srcdst_basic && - ( - cd src && - git checkout master && - test_commit D && - git checkout HEAD^0 - ) && - git ls-remote src refs/heads/master >expect && - ( - cd dst && - test_commit E && - git ls-remote . refs/remotes/origin/master >expect && - test_must_fail git push --force-with-lease=master origin master && - git ls-remote . refs/remotes/origin/master >actual && - test_cmp expect actual - ) && - git ls-remote src refs/heads/master >actual && - test_cmp expect actual -' - -test_expect_success 'push to update (protected, tracking, forced)' ' - setup_srcdst_basic && - ( - cd src && - git checkout master && - test_commit D && - git checkout HEAD^0 - ) && - ( - cd dst && - test_commit E && - git ls-remote . refs/remotes/origin/master >expect && - git push --force --force-with-lease=master origin master - ) && - git ls-remote dst refs/heads/master >expect && - git ls-remote src refs/heads/master >actual && - test_cmp expect actual -' - -test_expect_success 'push to update (allowed)' ' - setup_srcdst_basic && - ( - cd dst && - test_commit D && - git push --force-with-lease=master:master^ origin master - ) && - git ls-remote dst refs/heads/master >expect && - git ls-remote src refs/heads/master >actual && - test_cmp expect actual -' - -test_expect_success 'push to update (allowed, tracking)' ' - setup_srcdst_basic && - ( - cd dst && - test_commit D && - git push --force-with-lease=master origin master 2>err && - ! grep "forced update" err - ) && - git ls-remote dst refs/heads/master >expect && - git ls-remote src refs/heads/master >actual && - test_cmp expect actual -' - -test_expect_success 'push to update (allowed even though no-ff)' ' - setup_srcdst_basic && - ( - cd dst && - git reset --hard HEAD^ && - test_commit D && - git push --force-with-lease=master origin master 2>err && - grep "forced update" err - ) && - git ls-remote dst refs/heads/master >expect && - git ls-remote src refs/heads/master >actual && - test_cmp expect actual -' - -test_expect_success 'push to delete (protected)' ' - setup_srcdst_basic && - git ls-remote src refs/heads/master >expect && - ( - cd dst && - test_must_fail git push --force-with-lease=master:master^ origin :master - ) && - git ls-remote src refs/heads/master >actual && - test_cmp expect actual -' - -test_expect_success 'push to delete (protected, forced)' ' - setup_srcdst_basic && - ( - cd dst && - git push --force --force-with-lease=master:master^ origin :master - ) && - git ls-remote src refs/heads/master >actual && - test_must_be_empty actual -' - -test_expect_success 'push to delete (allowed)' ' - setup_srcdst_basic && - ( - cd dst && - git push --force-with-lease=master origin :master 2>err && - grep deleted err - ) && - git ls-remote src refs/heads/master >actual && - test_must_be_empty actual -' - -test_expect_success 'cover everything with default force-with-lease (protected)' ' - setup_srcdst_basic && - ( - cd src && - git branch naster master^ - ) && - git ls-remote src refs/heads/\* >expect && - ( - cd dst && - test_must_fail git push --force-with-lease origin master master:naster - ) && - git ls-remote src refs/heads/\* >actual && - test_cmp expect actual -' - -test_expect_success 'cover everything with default force-with-lease (allowed)' ' - setup_srcdst_basic && - ( - cd src && - git branch naster master^ - ) && - ( - cd dst && - git fetch && - git push --force-with-lease origin master master:naster - ) && - git ls-remote dst refs/heads/master | - sed -e "s/master/naster/" >expect && - git ls-remote src refs/heads/naster >actual && - test_cmp expect actual -' - -test_expect_success 'new branch covered by force-with-lease' ' - setup_srcdst_basic && - ( - cd dst && - git branch branch master && - git push --force-with-lease=branch origin branch - ) && - git ls-remote dst refs/heads/branch >expect && - git ls-remote src refs/heads/branch >actual && - test_cmp expect actual -' - -test_expect_success 'new branch covered by force-with-lease (explicit)' ' - setup_srcdst_basic && - ( - cd dst && - git branch branch master && - git push --force-with-lease=branch: origin branch - ) && - git ls-remote dst refs/heads/branch >expect && - git ls-remote src refs/heads/branch >actual && - test_cmp expect actual -' - -test_expect_success 'new branch already exists' ' - setup_srcdst_basic && - ( - cd src && - git checkout -b branch master && - test_commit F - ) && - ( - cd dst && - git branch branch master && - test_must_fail git push --force-with-lease=branch: origin branch - ) -' - -test_expect_success 'background updates of REMOTE can be mitigated with a non-updated REMOTE-push' ' - rm -rf src dst && - git init --bare src.bare && - test_when_finished "rm -rf src.bare" && - git clone --no-local src.bare dst && - test_when_finished "rm -rf dst" && - ( - cd dst && - test_commit G && - git remote add origin-push ../src.bare && - git push origin-push master:master - ) && - git clone --no-local src.bare dst2 && - test_when_finished "rm -rf dst2" && - ( - cd dst2 && - test_commit H && - git push - ) && - ( - cd dst && - test_commit I && - git fetch origin && - test_must_fail git push --force-with-lease origin-push && - git fetch origin-push && - git push --force-with-lease origin-push - ) -' - -test_done -- cgit 1.4.1