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/t7517-per-repo-email.sh | 162 ------------------------------ 1 file changed, 162 deletions(-) delete mode 100755 third_party/git/t/t7517-per-repo-email.sh (limited to 'third_party/git/t/t7517-per-repo-email.sh') diff --git a/third_party/git/t/t7517-per-repo-email.sh b/third_party/git/t/t7517-per-repo-email.sh deleted file mode 100755 index b2401cec3e3b..000000000000 --- a/third_party/git/t/t7517-per-repo-email.sh +++ /dev/null @@ -1,162 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2016 Dan Aloni -# Copyright (c) 2016 Jeff King -# - -test_description='per-repo forced setting of email address' - -. ./test-lib.sh - -test_expect_success 'setup a likely user.useConfigOnly use case' ' - # we want to make sure a reflog is written, since that needs - # a non-strict ident. So be sure we have an actual commit. - test_commit foo && - - sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL && - sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL && - git config user.name "test" && - git config --global user.useConfigOnly true -' - -test_expect_success 'fails committing if clone email is not set' ' - test_must_fail git commit --allow-empty -m msg -' - -test_expect_success 'fails committing if clone email is not set, but EMAIL set' ' - test_must_fail env EMAIL=test@fail.com git commit --allow-empty -m msg -' - -test_expect_success 'succeeds committing if clone email is set' ' - test_config user.email "test@ok.com" && - git commit --allow-empty -m msg -' - -test_expect_success 'succeeds cloning if global email is not set' ' - git clone . clone -' - -test_expect_success 'set up rebase scenarios' ' - # temporarily enable an actual ident for this setup - test_config user.email foo@example.com && - test_commit new && - git branch side-without-commit HEAD^ && - git checkout -b side-with-commit HEAD^ && - test_commit side -' - -test_expect_success 'fast-forward rebase does not care about ident' ' - git checkout -B tmp side-without-commit && - git rebase master -' - -test_expect_success 'non-fast-forward rebase refuses to write commits' ' - test_when_finished "git rebase --abort || true" && - git checkout -B tmp side-with-commit && - test_must_fail git rebase master -' - -test_expect_success 'fast-forward rebase does not care about ident (interactive)' ' - git checkout -B tmp side-without-commit && - git rebase -i master -' - -test_expect_success 'non-fast-forward rebase refuses to write commits (interactive)' ' - test_when_finished "git rebase --abort || true" && - git checkout -B tmp side-with-commit && - test_must_fail git rebase -i master -' - -test_expect_success 'noop interactive rebase does not care about ident' ' - git checkout -B tmp side-with-commit && - git rebase -i HEAD^ -' - -test_expect_success REBASE_P \ - 'fast-forward rebase does not care about ident (preserve)' ' - git checkout -B tmp side-without-commit && - git rebase -p master -' - -test_expect_success REBASE_P \ - 'non-fast-forward rebase refuses to write commits (preserve)' ' - test_when_finished "git rebase --abort || true" && - git checkout -B tmp side-with-commit && - test_must_fail git rebase -p master -' - -test_expect_success 'author.name overrides user.name' ' - test_config user.name user && - test_config user.email user@example.com && - test_config author.name author && - test_commit author-name-override-user && - echo author user@example.com > expected-author && - echo user user@example.com > expected-committer && - git log --format="%an %ae" -1 > actual-author && - git log --format="%cn %ce" -1 > actual-committer && - test_cmp expected-author actual-author && - test_cmp expected-committer actual-committer -' - -test_expect_success 'author.email overrides user.email' ' - test_config user.name user && - test_config user.email user@example.com && - test_config author.email author@example.com && - test_commit author-email-override-user && - echo user author@example.com > expected-author && - echo user user@example.com > expected-committer && - git log --format="%an %ae" -1 > actual-author && - git log --format="%cn %ce" -1 > actual-committer && - test_cmp expected-author actual-author && - test_cmp expected-committer actual-committer -' - -test_expect_success 'committer.name overrides user.name' ' - test_config user.name user && - test_config user.email user@example.com && - test_config committer.name committer && - test_commit committer-name-override-user && - echo user user@example.com > expected-author && - echo committer user@example.com > expected-committer && - git log --format="%an %ae" -1 > actual-author && - git log --format="%cn %ce" -1 > actual-committer && - test_cmp expected-author actual-author && - test_cmp expected-committer actual-committer -' - -test_expect_success 'committer.email overrides user.email' ' - test_config user.name user && - test_config user.email user@example.com && - test_config committer.email committer@example.com && - test_commit committer-email-override-user && - echo user user@example.com > expected-author && - echo user committer@example.com > expected-committer && - git log --format="%an %ae" -1 > actual-author && - git log --format="%cn %ce" -1 > actual-committer && - test_cmp expected-author actual-author && - test_cmp expected-committer actual-committer -' - -test_expect_success 'author and committer environment variables override config settings' ' - test_config user.name user && - test_config user.email user@example.com && - test_config author.name author && - test_config author.email author@example.com && - test_config committer.name committer && - test_config committer.email committer@example.com && - GIT_AUTHOR_NAME=env_author && export GIT_AUTHOR_NAME && - GIT_AUTHOR_EMAIL=env_author@example.com && export GIT_AUTHOR_EMAIL && - GIT_COMMITTER_NAME=env_commit && export GIT_COMMITTER_NAME && - GIT_COMMITTER_EMAIL=env_commit@example.com && export GIT_COMMITTER_EMAIL && - test_commit env-override-conf && - echo env_author env_author@example.com > expected-author && - echo env_commit env_commit@example.com > expected-committer && - git log --format="%an %ae" -1 > actual-author && - git log --format="%cn %ce" -1 > actual-committer && - sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL && - sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL && - test_cmp expected-author actual-author && - test_cmp expected-committer actual-committer -' - -test_done -- cgit 1.4.1