diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
| commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
| tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t3435-rebase-gpg-sign.sh | |
| parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) | |
chore(3p/git): Unvendor git and track patches instead r/2903
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
Diffstat (limited to 'third_party/git/t/t3435-rebase-gpg-sign.sh')
| -rwxr-xr-x | third_party/git/t/t3435-rebase-gpg-sign.sh | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/third_party/git/t/t3435-rebase-gpg-sign.sh b/third_party/git/t/t3435-rebase-gpg-sign.sh deleted file mode 100755 index b47c59c190b3..000000000000 --- a/third_party/git/t/t3435-rebase-gpg-sign.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2020 Doan Tran Cong Danh -# - -test_description='test rebase --[no-]gpg-sign' - -. ./test-lib.sh -. "$TEST_DIRECTORY/lib-rebase.sh" -. "$TEST_DIRECTORY/lib-gpg.sh" - -if ! test_have_prereq GPG -then - skip_all='skip all test rebase --[no-]gpg-sign, gpg not available' - test_done -fi - -test_rebase_gpg_sign () { - local must_fail= will=will fake_editor= - if test "x$1" = "x!" - then - must_fail=test_must_fail - will="won't" - shift - fi - conf=$1 - shift - test_expect_success "rebase $* with commit.gpgsign=$conf $will sign commit" " - git reset two && - git config commit.gpgsign $conf && - set_fake_editor && - FAKE_LINES='r 1 p 2' git rebase --force-rebase --root $* && - $must_fail git verify-commit HEAD^ && - $must_fail git verify-commit HEAD - " -} - -test_expect_success 'setup' ' - test_commit one && - test_commit two && - test_must_fail git verify-commit HEAD && - test_must_fail git verify-commit HEAD^ -' - -test_expect_success 'setup: merge commit' ' - test_commit fork-point && - git switch -c side && - test_commit three && - git switch master && - git merge --no-ff side && - git tag merged -' - -test_rebase_gpg_sign ! false -test_rebase_gpg_sign true -test_rebase_gpg_sign ! true --no-gpg-sign -test_rebase_gpg_sign ! true --gpg-sign --no-gpg-sign -test_rebase_gpg_sign false --no-gpg-sign --gpg-sign -test_rebase_gpg_sign true -i -test_rebase_gpg_sign ! true -i --no-gpg-sign -test_rebase_gpg_sign ! true -i --gpg-sign --no-gpg-sign -test_rebase_gpg_sign false -i --no-gpg-sign --gpg-sign - -test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' ' - git reset --hard merged && - git config commit.gpgsign true && - git rebase -p --no-gpg-sign --onto=one fork-point master && - test_must_fail git verify-commit HEAD -' - -test_done |