mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
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>
294 lines
8.7 KiB
Bash
Executable file
294 lines
8.7 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git rebase --continue tests'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
. "$TEST_DIRECTORY"/lib-rebase.sh
|
|
|
|
set_fake_editor
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit "commit-new-file-F1" F1 1 &&
|
|
test_commit "commit-new-file-F2" F2 2 &&
|
|
|
|
git checkout -b topic HEAD^ &&
|
|
test_commit "commit-new-file-F2-on-topic-branch" F2 22 &&
|
|
|
|
git checkout master
|
|
'
|
|
|
|
test_expect_success 'interactive rebase --continue works with touched file' '
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard &&
|
|
git checkout master &&
|
|
|
|
FAKE_LINES="edit 1" git rebase -i HEAD^ &&
|
|
test-tool chmtime =-60 F1 &&
|
|
git rebase --continue
|
|
'
|
|
|
|
test_expect_success 'non-interactive rebase --continue works with touched file' '
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard &&
|
|
git checkout master &&
|
|
|
|
test_must_fail git rebase --onto master master topic &&
|
|
echo "Resolved" >F2 &&
|
|
git add F2 &&
|
|
test-tool chmtime =-60 F1 &&
|
|
git rebase --continue
|
|
'
|
|
|
|
test_expect_success 'rebase --continue can not be used with other options' '
|
|
test_must_fail git rebase -v --continue &&
|
|
test_must_fail git rebase --continue -v
|
|
'
|
|
|
|
test_expect_success 'rebase --continue remembers merge strategy and options' '
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard commit-new-file-F2-on-topic-branch &&
|
|
test_commit "commit-new-file-F3-on-topic-branch" F3 32 &&
|
|
test_when_finished "rm -fr test-bin funny.was.run" &&
|
|
mkdir test-bin &&
|
|
cat >test-bin/git-merge-funny <<-EOF &&
|
|
#!$SHELL_PATH
|
|
case "\$1" in --opt) ;; *) exit 2 ;; esac
|
|
shift &&
|
|
>funny.was.run &&
|
|
exec git merge-recursive "\$@"
|
|
EOF
|
|
chmod +x test-bin/git-merge-funny &&
|
|
(
|
|
PATH=./test-bin:$PATH &&
|
|
test_must_fail git rebase -s funny -Xopt master topic
|
|
) &&
|
|
test -f funny.was.run &&
|
|
rm funny.was.run &&
|
|
echo "Resolved" >F2 &&
|
|
git add F2 &&
|
|
(
|
|
PATH=./test-bin:$PATH &&
|
|
git rebase --continue
|
|
) &&
|
|
test -f funny.was.run
|
|
'
|
|
|
|
test_expect_success 'rebase -i --continue handles merge strategy and options' '
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard commit-new-file-F2-on-topic-branch &&
|
|
test_commit "commit-new-file-F3-on-topic-branch-for-dash-i" F3 32 &&
|
|
test_when_finished "rm -fr test-bin funny.was.run funny.args" &&
|
|
mkdir test-bin &&
|
|
cat >test-bin/git-merge-funny <<-EOF &&
|
|
#!$SHELL_PATH
|
|
echo "\$@" >>funny.args
|
|
case "\$1" in --opt) ;; *) exit 2 ;; esac
|
|
case "\$2" in --foo) ;; *) exit 2 ;; esac
|
|
case "\$4" in --) ;; *) exit 2 ;; esac
|
|
shift 2 &&
|
|
>funny.was.run &&
|
|
exec git merge-recursive "\$@"
|
|
EOF
|
|
chmod +x test-bin/git-merge-funny &&
|
|
(
|
|
PATH=./test-bin:$PATH &&
|
|
test_must_fail git rebase -i -s funny -Xopt -Xfoo master topic
|
|
) &&
|
|
test -f funny.was.run &&
|
|
rm funny.was.run &&
|
|
echo "Resolved" >F2 &&
|
|
git add F2 &&
|
|
(
|
|
PATH=./test-bin:$PATH &&
|
|
git rebase --continue
|
|
) &&
|
|
test -f funny.was.run
|
|
'
|
|
|
|
test_expect_success REBASE_P 'rebase passes merge strategy options correctly' '
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard commit-new-file-F3-on-topic-branch &&
|
|
test_commit theirs-to-merge &&
|
|
git reset --hard HEAD^ &&
|
|
test_commit some-commit &&
|
|
test_tick &&
|
|
git merge --no-ff theirs-to-merge &&
|
|
FAKE_LINES="1 edit 2 3" git rebase -i -f -p -m \
|
|
-s recursive --strategy-option=theirs HEAD~2 &&
|
|
test_commit force-change &&
|
|
git rebase --continue
|
|
'
|
|
|
|
test_expect_success 'rebase -r passes merge strategy options correctly' '
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard commit-new-file-F3-on-topic-branch &&
|
|
test_commit merge-theirs &&
|
|
git reset --hard HEAD^ &&
|
|
test_commit some-other-commit &&
|
|
test_tick &&
|
|
git merge --no-ff merge-theirs &&
|
|
FAKE_LINES="1 3 edit 4 5 7 8 9" git rebase -i -f -r -m \
|
|
-s recursive --strategy-option=theirs HEAD~2 &&
|
|
test_commit force-change-ours &&
|
|
git rebase --continue
|
|
'
|
|
|
|
test_expect_success '--skip after failed fixup cleans commit message' '
|
|
test_when_finished "test_might_fail git rebase --abort" &&
|
|
git checkout -b with-conflicting-fixup &&
|
|
test_commit wants-fixup &&
|
|
test_commit "fixup! wants-fixup" wants-fixup.t 1 wants-fixup-1 &&
|
|
test_commit "fixup! wants-fixup" wants-fixup.t 2 wants-fixup-2 &&
|
|
test_commit "fixup! wants-fixup" wants-fixup.t 3 wants-fixup-3 &&
|
|
test_must_fail env FAKE_LINES="1 fixup 2 squash 4" \
|
|
git rebase -i HEAD~4 &&
|
|
|
|
: now there is a conflict, and comments in the commit message &&
|
|
git show HEAD >out &&
|
|
grep "fixup! wants-fixup" out &&
|
|
|
|
: skip and continue &&
|
|
echo "cp \"\$1\" .git/copy.txt" | write_script copy-editor.sh &&
|
|
(test_set_editor "$PWD/copy-editor.sh" && git rebase --skip) &&
|
|
|
|
: the user should not have had to edit the commit message &&
|
|
test_path_is_missing .git/copy.txt &&
|
|
|
|
: now the comments in the commit message should have been cleaned up &&
|
|
git show HEAD >out &&
|
|
! grep "fixup! wants-fixup" out &&
|
|
|
|
: now, let us ensure that "squash" is handled correctly &&
|
|
git reset --hard wants-fixup-3 &&
|
|
test_must_fail env FAKE_LINES="1 squash 4 squash 2 squash 4" \
|
|
git rebase -i HEAD~4 &&
|
|
|
|
: the first squash failed, but there are two more in the chain &&
|
|
(test_set_editor "$PWD/copy-editor.sh" &&
|
|
test_must_fail git rebase --skip) &&
|
|
|
|
: not the final squash, no need to edit the commit message &&
|
|
test_path_is_missing .git/copy.txt &&
|
|
|
|
: The first squash was skipped, therefore: &&
|
|
git show HEAD >out &&
|
|
test_i18ngrep "# This is a combination of 2 commits" out &&
|
|
test_i18ngrep "# This is the commit message #2:" out &&
|
|
|
|
(test_set_editor "$PWD/copy-editor.sh" && git rebase --skip) &&
|
|
git show HEAD >out &&
|
|
test_i18ngrep ! "# This is a combination" out &&
|
|
|
|
: Final squash failed, but there was still a squash &&
|
|
test_i18ngrep "# This is a combination of 2 commits" .git/copy.txt &&
|
|
test_i18ngrep "# This is the commit message #2:" .git/copy.txt
|
|
'
|
|
|
|
test_expect_success 'setup rerere database' '
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard commit-new-file-F3-on-topic-branch &&
|
|
git checkout master &&
|
|
test_commit "commit-new-file-F3" F3 3 &&
|
|
test_config rerere.enabled true &&
|
|
git update-ref refs/heads/topic commit-new-file-F3-on-topic-branch &&
|
|
test_must_fail git rebase -m master topic &&
|
|
echo "Resolved" >F2 &&
|
|
cp F2 expected-F2 &&
|
|
git add F2 &&
|
|
test_must_fail git rebase --continue &&
|
|
echo "Resolved" >F3 &&
|
|
cp F3 expected-F3 &&
|
|
git add F3 &&
|
|
git rebase --continue &&
|
|
git reset --hard topic@{1}
|
|
'
|
|
|
|
prepare () {
|
|
rm -fr .git/rebase-* &&
|
|
git reset --hard commit-new-file-F3-on-topic-branch &&
|
|
git checkout master &&
|
|
test_config rerere.enabled true
|
|
}
|
|
|
|
test_rerere_autoupdate () {
|
|
action=$1 &&
|
|
test_expect_success "rebase $action --continue remembers --rerere-autoupdate" '
|
|
prepare &&
|
|
test_must_fail git rebase $action --rerere-autoupdate master topic &&
|
|
test_cmp expected-F2 F2 &&
|
|
git diff-files --quiet &&
|
|
test_must_fail git rebase --continue &&
|
|
test_cmp expected-F3 F3 &&
|
|
git diff-files --quiet &&
|
|
git rebase --continue
|
|
'
|
|
|
|
test_expect_success "rebase $action --continue honors rerere.autoUpdate" '
|
|
prepare &&
|
|
test_config rerere.autoupdate true &&
|
|
test_must_fail git rebase $action master topic &&
|
|
test_cmp expected-F2 F2 &&
|
|
git diff-files --quiet &&
|
|
test_must_fail git rebase --continue &&
|
|
test_cmp expected-F3 F3 &&
|
|
git diff-files --quiet &&
|
|
git rebase --continue
|
|
'
|
|
|
|
test_expect_success "rebase $action --continue remembers --no-rerere-autoupdate" '
|
|
prepare &&
|
|
test_config rerere.autoupdate true &&
|
|
test_must_fail git rebase $action --no-rerere-autoupdate master topic &&
|
|
test_cmp expected-F2 F2 &&
|
|
test_must_fail git diff-files --quiet &&
|
|
git add F2 &&
|
|
test_must_fail git rebase --continue &&
|
|
test_cmp expected-F3 F3 &&
|
|
test_must_fail git diff-files --quiet &&
|
|
git add F3 &&
|
|
git rebase --continue
|
|
'
|
|
}
|
|
|
|
test_rerere_autoupdate
|
|
test_rerere_autoupdate -m
|
|
GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
|
|
test_rerere_autoupdate -i
|
|
test_have_prereq !REBASE_P || test_rerere_autoupdate --preserve-merges
|
|
unset GIT_SEQUENCE_EDITOR
|
|
|
|
test_expect_success 'the todo command "break" works' '
|
|
rm -f execed &&
|
|
FAKE_LINES="break b exec_>execed" git rebase -i HEAD &&
|
|
test_path_is_missing execed &&
|
|
git rebase --continue &&
|
|
test_path_is_missing execed &&
|
|
git rebase --continue &&
|
|
test_path_is_file execed
|
|
'
|
|
|
|
test_expect_success '--reschedule-failed-exec' '
|
|
test_when_finished "git rebase --abort" &&
|
|
test_must_fail git rebase -x false --reschedule-failed-exec HEAD^ &&
|
|
grep "^exec false" .git/rebase-merge/git-rebase-todo &&
|
|
git rebase --abort &&
|
|
test_must_fail git -c rebase.rescheduleFailedExec=true \
|
|
rebase -x false HEAD^ 2>err &&
|
|
grep "^exec false" .git/rebase-merge/git-rebase-todo &&
|
|
test_i18ngrep "has been rescheduled" err
|
|
'
|
|
|
|
test_expect_success 'rebase.reschedulefailedexec only affects `rebase -i`' '
|
|
test_config rebase.reschedulefailedexec true &&
|
|
test_must_fail git rebase -x false HEAD^ &&
|
|
grep "^exec false" .git/rebase-merge/git-rebase-todo &&
|
|
git rebase --abort &&
|
|
git rebase HEAD^
|
|
'
|
|
|
|
test_done
|