334afbc76f
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>
114 lines
4.1 KiB
Bash
Executable File
114 lines
4.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git rebase tests for -Xsubtree
|
|
|
|
This test runs git rebase and tests the subtree strategy.
|
|
'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-rebase.sh
|
|
|
|
commit_message() {
|
|
git log --pretty=format:%s -1 "$1"
|
|
}
|
|
|
|
# There are a few bugs in the rebase with regards to the subtree strategy, and
|
|
# this test script tries to document them. First, the following commit history
|
|
# is generated (the onelines are shown, time flows from left to right):
|
|
#
|
|
# topic_1 - topic_2 - topic_3
|
|
# \
|
|
# README ---------------------- Add subproject master - topic_4 - files_subtree/topic_5
|
|
#
|
|
# Where the merge moves the files topic_[123].t into the subdirectory
|
|
# files_subtree/ and topic_4 as well as files_subtree/topic_5 add files to that
|
|
# directory directly.
|
|
#
|
|
# Then, in subsequent test cases, `git filter-branch` is used to distill just
|
|
# the commits that touch files_subtree/. To give it a final pre-rebase touch,
|
|
# an empty commit is added on top. The pre-rebase commit history looks like
|
|
# this:
|
|
#
|
|
# Add subproject master - topic_4 - files_subtree/topic_5 - Empty commit
|
|
#
|
|
# where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t.
|
|
#
|
|
# This commit history is then rebased onto `topic_3` with the
|
|
# `-Xsubtree=files_subtree` option in three different ways:
|
|
#
|
|
# 1. using `--preserve-merges`
|
|
# 2. using `--preserve-merges` and --keep-empty
|
|
# 3. without specifying a rebase backend
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit README &&
|
|
|
|
git init files &&
|
|
test_commit -C files topic_1 &&
|
|
test_commit -C files topic_2 &&
|
|
test_commit -C files topic_3 &&
|
|
|
|
: perform subtree merge into files_subtree/ &&
|
|
git fetch files refs/heads/master:refs/heads/files-master &&
|
|
git merge -s ours --no-commit --allow-unrelated-histories \
|
|
files-master &&
|
|
git read-tree --prefix=files_subtree -u files-master &&
|
|
git commit -m "Add subproject master" &&
|
|
|
|
: add two extra commits to rebase &&
|
|
test_commit -C files_subtree topic_4 &&
|
|
test_commit files_subtree/topic_5 &&
|
|
|
|
git checkout -b to-rebase &&
|
|
git fast-export --no-data HEAD -- files_subtree/ |
|
|
sed -e "s%\([0-9a-f]\{40\} \)files_subtree/%\1%" |
|
|
git fast-import --force --quiet &&
|
|
git reset --hard &&
|
|
git commit -m "Empty commit" --allow-empty
|
|
'
|
|
|
|
# FAILURE: Does not preserve topic_4.
|
|
test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '
|
|
reset_rebase &&
|
|
git checkout -b rebase-preserve-merges to-rebase &&
|
|
git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
|
|
verbose test "$(commit_message HEAD~)" = "topic_4" &&
|
|
verbose test "$(commit_message HEAD)" = "files_subtree/topic_5"
|
|
'
|
|
|
|
# FAILURE: Does not preserve topic_4.
|
|
test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '
|
|
reset_rebase &&
|
|
git checkout -b rebase-keep-empty to-rebase &&
|
|
git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
|
|
verbose test "$(commit_message HEAD~2)" = "topic_4" &&
|
|
verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
|
|
verbose test "$(commit_message HEAD)" = "Empty commit"
|
|
'
|
|
|
|
test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
|
|
reset_rebase &&
|
|
git checkout -b rebase-onto to-rebase &&
|
|
test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-master master &&
|
|
: first pick results in no changes &&
|
|
git rebase --skip &&
|
|
verbose test "$(commit_message HEAD~2)" = "topic_4" &&
|
|
verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
|
|
verbose test "$(commit_message HEAD)" = "Empty commit"
|
|
'
|
|
|
|
test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' '
|
|
reset_rebase &&
|
|
git checkout -b rebase-merges-onto to-rebase &&
|
|
test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-master --root &&
|
|
: first pick results in no changes &&
|
|
git rebase --skip &&
|
|
verbose test "$(commit_message HEAD~2)" = "topic_4" &&
|
|
verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
|
|
verbose test "$(commit_message HEAD)" = "Empty commit"
|
|
'
|
|
|
|
test_done
|