2008-02-29 23:08:47 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='git rebase --abort tests'
|
|
|
|
|
2020-11-19 00:44:25 +01: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-19 00:44:19 +01:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2008-02-29 23:08:47 +01:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success setup '
|
2021-09-13 17:19:13 +02:00
|
|
|
test_commit a a a &&
|
2008-02-29 23:08:47 +01:00
|
|
|
git branch to-rebase &&
|
|
|
|
|
2021-09-13 17:19:13 +02:00
|
|
|
test_commit b a b &&
|
|
|
|
test_commit c a c &&
|
2008-02-29 23:08:47 +01:00
|
|
|
|
|
|
|
git checkout to-rebase &&
|
2021-09-13 17:19:13 +02:00
|
|
|
test_commit "merge should fail on this" a d d &&
|
|
|
|
test_commit "merge should fail on this, too" a e pre-rebase
|
2008-02-29 23:08:47 +01:00
|
|
|
'
|
|
|
|
|
2021-09-13 17:19:17 +02:00
|
|
|
# Check that HEAD is equal to "pre-rebase" and the current branch is
|
|
|
|
# "to-rebase"
|
|
|
|
check_head() {
|
|
|
|
test_cmp_rev HEAD pre-rebase &&
|
|
|
|
test "$(git symbolic-ref HEAD)" = refs/heads/to-rebase
|
|
|
|
}
|
|
|
|
|
2008-03-01 12:12:13 +01:00
|
|
|
testrebase() {
|
|
|
|
type=$1
|
2021-09-13 17:19:15 +02:00
|
|
|
state_dir=$2
|
2008-02-29 23:08:47 +01:00
|
|
|
|
2008-03-01 12:12:13 +01:00
|
|
|
test_expect_success "rebase$type --abort" '
|
|
|
|
# Clean up the state from the previous one
|
2008-05-04 07:37:51 +02:00
|
|
|
git reset --hard pre-rebase &&
|
2020-11-19 00:44:25 +01:00
|
|
|
test_must_fail git rebase$type main &&
|
2021-09-13 17:19:15 +02:00
|
|
|
test_path_is_dir "$state_dir" &&
|
2008-03-01 12:12:13 +01:00
|
|
|
git rebase --abort &&
|
2021-09-13 17:19:17 +02:00
|
|
|
check_head &&
|
2021-09-13 17:19:16 +02:00
|
|
|
test_path_is_missing "$state_dir"
|
2008-03-01 12:12:13 +01:00
|
|
|
'
|
2008-02-29 23:08:47 +01:00
|
|
|
|
2008-03-01 12:12:13 +01:00
|
|
|
test_expect_success "rebase$type --abort after --skip" '
|
|
|
|
# Clean up the state from the previous one
|
2008-05-04 07:37:51 +02:00
|
|
|
git reset --hard pre-rebase &&
|
2020-11-19 00:44:25 +01:00
|
|
|
test_must_fail git rebase$type main &&
|
2021-09-13 17:19:15 +02:00
|
|
|
test_path_is_dir "$state_dir" &&
|
2008-03-01 12:12:13 +01:00
|
|
|
test_must_fail git rebase --skip &&
|
2021-09-13 17:19:14 +02:00
|
|
|
test_cmp_rev HEAD main &&
|
2008-09-03 10:59:27 +02:00
|
|
|
git rebase --abort &&
|
2021-09-13 17:19:17 +02:00
|
|
|
check_head &&
|
2021-09-13 17:19:16 +02:00
|
|
|
test_path_is_missing "$state_dir"
|
2008-03-01 12:12:13 +01:00
|
|
|
'
|
2008-02-29 23:08:47 +01:00
|
|
|
|
2008-03-01 12:12:13 +01:00
|
|
|
test_expect_success "rebase$type --abort after --continue" '
|
|
|
|
# Clean up the state from the previous one
|
2008-05-04 07:37:51 +02:00
|
|
|
git reset --hard pre-rebase &&
|
2020-11-19 00:44:25 +01:00
|
|
|
test_must_fail git rebase$type main &&
|
2021-09-13 17:19:15 +02:00
|
|
|
test_path_is_dir "$state_dir" &&
|
2008-03-01 12:12:13 +01:00
|
|
|
echo c > a &&
|
|
|
|
echo d >> a &&
|
|
|
|
git add a &&
|
|
|
|
test_must_fail git rebase --continue &&
|
2021-09-13 17:19:14 +02:00
|
|
|
test_cmp_rev ! HEAD main &&
|
2008-03-01 12:12:13 +01:00
|
|
|
git rebase --abort &&
|
2021-09-13 17:19:17 +02:00
|
|
|
check_head &&
|
2021-09-13 17:19:16 +02:00
|
|
|
test_path_is_missing "$state_dir"
|
2008-03-01 12:12:13 +01:00
|
|
|
'
|
2010-11-21 12:11:21 +01:00
|
|
|
|
|
|
|
test_expect_success "rebase$type --abort does not update reflog" '
|
|
|
|
# Clean up the state from the previous one
|
|
|
|
git reset --hard pre-rebase &&
|
|
|
|
git reflog show to-rebase > reflog_before &&
|
2020-11-19 00:44:25 +01:00
|
|
|
test_must_fail git rebase$type main &&
|
2010-11-21 12:11:21 +01:00
|
|
|
git rebase --abort &&
|
|
|
|
git reflog show to-rebase > reflog_after &&
|
|
|
|
test_cmp reflog_before reflog_after &&
|
|
|
|
rm reflog_before reflog_after
|
|
|
|
'
|
2011-02-06 19:43:36 +01:00
|
|
|
|
|
|
|
test_expect_success 'rebase --abort can not be used with other options' '
|
|
|
|
# Clean up the state from the previous one
|
|
|
|
git reset --hard pre-rebase &&
|
2020-11-19 00:44:25 +01:00
|
|
|
test_must_fail git rebase$type main &&
|
2011-02-06 19:43:36 +01:00
|
|
|
test_must_fail git rebase -v --abort &&
|
|
|
|
test_must_fail git rebase --abort -v &&
|
|
|
|
git rebase --abort
|
|
|
|
'
|
2008-03-01 12:12:13 +01:00
|
|
|
}
|
2008-02-29 23:08:47 +01:00
|
|
|
|
2020-02-15 22:36:41 +01:00
|
|
|
testrebase " --apply" .git/rebase-apply
|
2008-07-16 03:33:44 +02:00
|
|
|
testrebase " --merge" .git/rebase-merge
|
2008-02-29 23:08:47 +01:00
|
|
|
|
2020-02-15 22:36:41 +01:00
|
|
|
test_expect_success 'rebase --apply --quit' '
|
2016-11-12 03:00:41 +01:00
|
|
|
# Clean up the state from the previous one
|
|
|
|
git reset --hard pre-rebase &&
|
2020-11-19 00:44:25 +01:00
|
|
|
test_must_fail git rebase --apply main &&
|
2016-11-12 03:00:41 +01:00
|
|
|
test_path_is_dir .git/rebase-apply &&
|
|
|
|
head_before=$(git rev-parse HEAD) &&
|
|
|
|
git rebase --quit &&
|
2021-09-13 17:19:14 +02:00
|
|
|
test_cmp_rev HEAD $head_before &&
|
2021-09-13 17:19:16 +02:00
|
|
|
test_path_is_missing .git/rebase-apply
|
2016-11-12 03:00:41 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase --merge --quit' '
|
|
|
|
# Clean up the state from the previous one
|
|
|
|
git reset --hard pre-rebase &&
|
2020-11-19 00:44:25 +01:00
|
|
|
test_must_fail git rebase --merge main &&
|
2016-11-12 03:00:41 +01:00
|
|
|
test_path_is_dir .git/rebase-merge &&
|
|
|
|
head_before=$(git rev-parse HEAD) &&
|
|
|
|
git rebase --quit &&
|
2021-09-13 17:19:14 +02:00
|
|
|
test_cmp_rev HEAD $head_before &&
|
2021-09-13 17:19:16 +02:00
|
|
|
test_path_is_missing .git/rebase-merge
|
2016-11-12 03:00:41 +01:00
|
|
|
'
|
|
|
|
|
2008-02-29 23:08:47 +01:00
|
|
|
test_done
|