2020-04-03 10:28:02 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2020 Doan Tran Cong Danh
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='test rebase --[no-]gpg-sign'
|
|
|
|
|
2020-11-18 23:44:25 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2020-04-03 10:28:02 +00:00
|
|
|
. ./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 &&
|
2020-11-18 23:44:25 +00:00
|
|
|
git switch main &&
|
2020-04-03 10:28:02 +00:00
|
|
|
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
|
|
|
|
|
2020-10-17 23:15:55 +00:00
|
|
|
test_expect_success 'rebase -r, merge strategy, --gpg-sign will sign commit' '
|
|
|
|
git reset --hard merged &&
|
|
|
|
test_unconfig commit.gpgsign &&
|
|
|
|
git rebase -fr --gpg-sign -s resolve --root &&
|
|
|
|
git verify-commit HEAD
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase -r, merge strategy, commit.gpgsign=true will sign commit' '
|
|
|
|
git reset --hard merged &&
|
|
|
|
git config commit.gpgsign true &&
|
|
|
|
git rebase -fr -s resolve --root &&
|
|
|
|
git verify-commit HEAD
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase -r, merge strategy, commit.gpgsign=false --gpg-sign will sign commit' '
|
|
|
|
git reset --hard merged &&
|
|
|
|
git config commit.gpgsign false &&
|
|
|
|
git rebase -fr --gpg-sign -s resolve --root &&
|
|
|
|
git verify-commit HEAD
|
|
|
|
'
|
|
|
|
|
2020-10-17 23:15:56 +00:00
|
|
|
test_expect_success "rebase -r, merge strategy, commit.gpgsign=true --no-gpg-sign won't sign commit" '
|
|
|
|
git reset --hard merged &&
|
|
|
|
git config commit.gpgsign true &&
|
|
|
|
git rebase -fr --no-gpg-sign -s resolve --root &&
|
|
|
|
test_must_fail git verify-commit HEAD
|
|
|
|
'
|
|
|
|
|
2020-10-17 23:15:57 +00:00
|
|
|
test_expect_success 'rebase -r --gpg-sign will sign commit' '
|
|
|
|
git reset --hard merged &&
|
|
|
|
test_unconfig commit.gpgsign &&
|
|
|
|
git rebase -fr --gpg-sign --root &&
|
|
|
|
git verify-commit HEAD
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase -r with commit.gpgsign=true will sign commit' '
|
|
|
|
git reset --hard merged &&
|
|
|
|
git config commit.gpgsign true &&
|
|
|
|
git rebase -fr --root &&
|
|
|
|
git verify-commit HEAD
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase -r --gpg-sign with commit.gpgsign=false will sign commit' '
|
|
|
|
git reset --hard merged &&
|
|
|
|
git config commit.gpgsign false &&
|
|
|
|
git rebase -fr --gpg-sign --root &&
|
|
|
|
git verify-commit HEAD
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success "rebase -r --no-gpg-sign with commit.gpgsign=true won't sign commit" '
|
|
|
|
git reset --hard merged &&
|
|
|
|
git config commit.gpgsign true &&
|
|
|
|
git rebase -fr --no-gpg-sign --root &&
|
|
|
|
test_must_fail git verify-commit HEAD
|
|
|
|
'
|
|
|
|
|
2020-04-03 10:28:02 +00:00
|
|
|
test_done
|