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/t3514-cherry-pick-revert-gpg.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/t3514-cherry-pick-revert-gpg.sh')
-rwxr-xr-x | third_party/git/t/t3514-cherry-pick-revert-gpg.sh | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/third_party/git/t/t3514-cherry-pick-revert-gpg.sh b/third_party/git/t/t3514-cherry-pick-revert-gpg.sh deleted file mode 100755 index 5b2e250eaa50..000000000000 --- a/third_party/git/t/t3514-cherry-pick-revert-gpg.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2020 Doan Tran Cong Danh -# - -test_description='test {cherry-pick,revert} --[no-]gpg-sign' - -. ./test-lib.sh -. "$TEST_DIRECTORY/lib-gpg.sh" - -if ! test_have_prereq GPG -then - skip_all='skip all test {cherry-pick,revert} --[no-]gpg-sign, gpg not available' - test_done -fi - -test_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 - cmd=$2 - cmit=$3 - shift 3 - test_expect_success "$cmd $* $cmit with commit.gpgsign=$conf $will sign commit" " - git reset --hard tip && - git config commit.gpgsign $conf && - git $cmd $* $cmit && - git rev-list tip.. >rev-list && - $must_fail git verify-commit \$(cat rev-list) - " -} - -test_expect_success 'setup' ' - test_commit one && - git switch -c side && - test_commit side1 && - test_commit side2 && - git switch - && - test_commit two && - test_commit three && - test_commit tip -' - -test_gpg_sign ! false cherry-pick side -test_gpg_sign ! false cherry-pick ..side -test_gpg_sign true cherry-pick side -test_gpg_sign true cherry-pick ..side -test_gpg_sign ! true cherry-pick side --no-gpg-sign -test_gpg_sign ! true cherry-pick ..side --no-gpg-sign -test_gpg_sign ! true cherry-pick side --gpg-sign --no-gpg-sign -test_gpg_sign ! true cherry-pick ..side --gpg-sign --no-gpg-sign -test_gpg_sign false cherry-pick side --no-gpg-sign --gpg-sign -test_gpg_sign false cherry-pick ..side --no-gpg-sign --gpg-sign -test_gpg_sign true cherry-pick side --edit -test_gpg_sign true cherry-pick ..side --edit -test_gpg_sign ! true cherry-pick side --edit --no-gpg-sign -test_gpg_sign ! true cherry-pick ..side --edit --no-gpg-sign -test_gpg_sign ! true cherry-pick side --edit --gpg-sign --no-gpg-sign -test_gpg_sign ! true cherry-pick ..side --edit --gpg-sign --no-gpg-sign -test_gpg_sign false cherry-pick side --edit --no-gpg-sign --gpg-sign -test_gpg_sign false cherry-pick ..side --edit --no-gpg-sign --gpg-sign - -test_gpg_sign ! false revert HEAD --edit -test_gpg_sign ! false revert two.. --edit -test_gpg_sign true revert HEAD --edit -test_gpg_sign true revert two.. --edit -test_gpg_sign ! true revert HEAD --edit --no-gpg-sign -test_gpg_sign ! true revert two.. --edit --no-gpg-sign -test_gpg_sign ! true revert HEAD --edit --gpg-sign --no-gpg-sign -test_gpg_sign ! true revert two.. --edit --gpg-sign --no-gpg-sign -test_gpg_sign false revert HEAD --edit --no-gpg-sign --gpg-sign -test_gpg_sign false revert two.. --edit --no-gpg-sign --gpg-sign -test_gpg_sign true revert HEAD --no-edit -test_gpg_sign true revert two.. --no-edit -test_gpg_sign ! true revert HEAD --no-edit --no-gpg-sign -test_gpg_sign ! true revert two.. --no-edit --no-gpg-sign -test_gpg_sign ! true revert HEAD --no-edit --gpg-sign --no-gpg-sign -test_gpg_sign ! true revert two.. --no-edit --gpg-sign --no-gpg-sign -test_gpg_sign false revert HEAD --no-edit --no-gpg-sign --gpg-sign - -test_done |