2010-03-12 17:04:28 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2010 Thomas Rast
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='Test the post-rewrite hook.'
|
2020-11-18 23:44:29 +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
|
|
|
|
|
2010-03-12 17:04:28 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
test_commit A foo A &&
|
|
|
|
test_commit B foo B &&
|
|
|
|
test_commit C foo C &&
|
2010-12-23 00:50:28 +00:00
|
|
|
test_commit D foo D &&
|
|
|
|
git checkout A^0 &&
|
|
|
|
test_commit E bar E &&
|
|
|
|
test_commit F foo F &&
|
2022-03-17 10:13:15 +00:00
|
|
|
git checkout main &&
|
2010-03-12 17:04:28 +00:00
|
|
|
|
2022-03-17 10:13:15 +00:00
|
|
|
test_hook --setup post-rewrite <<-EOF
|
|
|
|
echo \$@ > "$TRASH_DIRECTORY"/post-rewrite.args
|
|
|
|
cat > "$TRASH_DIRECTORY"/post-rewrite.data
|
|
|
|
EOF
|
|
|
|
'
|
2010-03-12 17:04:28 +00:00
|
|
|
|
|
|
|
clear_hook_input () {
|
|
|
|
rm -f post-rewrite.args post-rewrite.data
|
|
|
|
}
|
|
|
|
|
|
|
|
verify_hook_input () {
|
2013-05-30 13:46:35 +00:00
|
|
|
test_cmp expected.args "$TRASH_DIRECTORY"/post-rewrite.args &&
|
|
|
|
test_cmp expected.data "$TRASH_DIRECTORY"/post-rewrite.data
|
2010-03-12 17:04:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'git commit --amend' '
|
|
|
|
clear_hook_input &&
|
|
|
|
echo "D new message" > newmsg &&
|
|
|
|
oldsha=$(git rev-parse HEAD^0) &&
|
|
|
|
git commit -Fnewmsg --amend &&
|
|
|
|
echo amend > expected.args &&
|
|
|
|
echo $oldsha $(git rev-parse HEAD^0) > expected.data &&
|
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git commit --amend --no-post-rewrite' '
|
|
|
|
clear_hook_input &&
|
|
|
|
echo "D new message again" > newmsg &&
|
|
|
|
git commit --no-post-rewrite -Fnewmsg --amend &&
|
|
|
|
test ! -f post-rewrite.args &&
|
|
|
|
test ! -f post-rewrite.data
|
|
|
|
'
|
|
|
|
|
2020-02-15 21:36:41 +00:00
|
|
|
test_expect_success 'git rebase --apply' '
|
2010-03-12 17:04:29 +00:00
|
|
|
git reset --hard D &&
|
|
|
|
clear_hook_input &&
|
2020-02-15 21:36:41 +00:00
|
|
|
test_must_fail git rebase --apply --onto A B &&
|
2010-03-12 17:04:29 +00:00
|
|
|
echo C > foo &&
|
|
|
|
git add foo &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo rebase >expected.args &&
|
2015-05-22 15:41:31 +00:00
|
|
|
cat >expected.data <<-EOF &&
|
|
|
|
$(git rev-parse C) $(git rev-parse HEAD^)
|
|
|
|
$(git rev-parse D) $(git rev-parse HEAD)
|
|
|
|
EOF
|
2010-03-12 17:04:29 +00:00
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
2020-02-15 21:36:41 +00:00
|
|
|
test_expect_success 'git rebase --apply --skip' '
|
2010-03-12 17:04:29 +00:00
|
|
|
git reset --hard D &&
|
|
|
|
clear_hook_input &&
|
2020-02-15 21:36:41 +00:00
|
|
|
test_must_fail git rebase --apply --onto A B &&
|
2010-03-12 17:04:29 +00:00
|
|
|
test_must_fail git rebase --skip &&
|
|
|
|
echo D > foo &&
|
|
|
|
git add foo &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo rebase >expected.args &&
|
2015-05-22 15:41:31 +00:00
|
|
|
cat >expected.data <<-EOF &&
|
2018-12-11 16:11:35 +00:00
|
|
|
$(git rev-parse C) $(git rev-parse HEAD^)
|
2015-05-22 15:41:31 +00:00
|
|
|
$(git rev-parse D) $(git rev-parse HEAD)
|
|
|
|
EOF
|
2010-03-12 17:04:29 +00:00
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
2020-02-15 21:36:41 +00:00
|
|
|
test_expect_success 'git rebase --apply --skip the last one' '
|
2010-12-23 00:50:28 +00:00
|
|
|
git reset --hard F &&
|
|
|
|
clear_hook_input &&
|
2020-02-15 21:36:41 +00:00
|
|
|
test_must_fail git rebase --apply --onto D A &&
|
2010-12-23 00:50:28 +00:00
|
|
|
git rebase --skip &&
|
|
|
|
echo rebase >expected.args &&
|
2015-05-22 15:41:31 +00:00
|
|
|
cat >expected.data <<-EOF &&
|
|
|
|
$(git rev-parse E) $(git rev-parse HEAD)
|
2018-12-11 16:11:35 +00:00
|
|
|
$(git rev-parse F) $(git rev-parse HEAD)
|
2015-05-22 15:41:31 +00:00
|
|
|
EOF
|
2010-12-23 00:50:28 +00:00
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
2010-03-12 17:04:30 +00:00
|
|
|
test_expect_success 'git rebase -m' '
|
|
|
|
git reset --hard D &&
|
|
|
|
clear_hook_input &&
|
|
|
|
test_must_fail git rebase -m --onto A B &&
|
|
|
|
echo C > foo &&
|
|
|
|
git add foo &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo rebase >expected.args &&
|
2015-05-22 15:41:31 +00:00
|
|
|
cat >expected.data <<-EOF &&
|
|
|
|
$(git rev-parse C) $(git rev-parse HEAD^)
|
|
|
|
$(git rev-parse D) $(git rev-parse HEAD)
|
|
|
|
EOF
|
2010-03-12 17:04:30 +00:00
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git rebase -m --skip' '
|
|
|
|
git reset --hard D &&
|
|
|
|
clear_hook_input &&
|
2018-06-07 05:05:50 +00:00
|
|
|
test_must_fail git rebase -m --onto A B &&
|
2010-03-12 17:04:30 +00:00
|
|
|
test_must_fail git rebase --skip &&
|
|
|
|
echo D > foo &&
|
|
|
|
git add foo &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo rebase >expected.args &&
|
2015-05-22 15:41:31 +00:00
|
|
|
cat >expected.data <<-EOF &&
|
2018-12-11 16:11:35 +00:00
|
|
|
$(git rev-parse C) $(git rev-parse HEAD^)
|
2015-05-22 15:41:31 +00:00
|
|
|
$(git rev-parse D) $(git rev-parse HEAD)
|
|
|
|
EOF
|
2010-03-12 17:04:30 +00:00
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
2020-02-15 21:36:41 +00:00
|
|
|
test_expect_success 'git rebase with implicit use of merge backend' '
|
2018-12-11 16:11:34 +00:00
|
|
|
git reset --hard D &&
|
|
|
|
clear_hook_input &&
|
2019-03-25 18:14:18 +00:00
|
|
|
test_must_fail git rebase --keep-empty --onto A B &&
|
2018-12-11 16:11:34 +00:00
|
|
|
echo C > foo &&
|
|
|
|
git add foo &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo rebase >expected.args &&
|
|
|
|
cat >expected.data <<-EOF &&
|
|
|
|
$(git rev-parse C) $(git rev-parse HEAD^)
|
|
|
|
$(git rev-parse D) $(git rev-parse HEAD)
|
|
|
|
EOF
|
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
2020-02-15 21:36:41 +00:00
|
|
|
test_expect_success 'git rebase --skip with implicit use of merge backend' '
|
2018-12-11 16:11:34 +00:00
|
|
|
git reset --hard D &&
|
|
|
|
clear_hook_input &&
|
2019-03-25 18:14:18 +00:00
|
|
|
test_must_fail git rebase --keep-empty --onto A B &&
|
2018-12-11 16:11:34 +00:00
|
|
|
test_must_fail git rebase --skip &&
|
|
|
|
echo D > foo &&
|
|
|
|
git add foo &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo rebase >expected.args &&
|
|
|
|
cat >expected.data <<-EOF &&
|
|
|
|
$(git rev-parse C) $(git rev-parse HEAD^)
|
|
|
|
$(git rev-parse D) $(git rev-parse HEAD)
|
|
|
|
EOF
|
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
2010-03-12 17:04:30 +00:00
|
|
|
. "$TEST_DIRECTORY"/lib-rebase.sh
|
|
|
|
|
|
|
|
set_fake_editor
|
|
|
|
|
|
|
|
# Helper to work around the lack of one-shot exporting for
|
|
|
|
# test_must_fail (as it is a shell function)
|
|
|
|
test_fail_interactive_rebase () {
|
|
|
|
(
|
|
|
|
FAKE_LINES="$1" &&
|
|
|
|
shift &&
|
|
|
|
export FAKE_LINES &&
|
|
|
|
test_must_fail git rebase -i "$@"
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'git rebase -i (unchanged)' '
|
|
|
|
git reset --hard D &&
|
|
|
|
clear_hook_input &&
|
|
|
|
test_fail_interactive_rebase "1 2" --onto A B &&
|
|
|
|
echo C > foo &&
|
|
|
|
git add foo &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo rebase >expected.args &&
|
2015-05-22 15:41:31 +00:00
|
|
|
cat >expected.data <<-EOF &&
|
|
|
|
$(git rev-parse C) $(git rev-parse HEAD^)
|
|
|
|
$(git rev-parse D) $(git rev-parse HEAD)
|
|
|
|
EOF
|
2010-03-12 17:04:30 +00:00
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git rebase -i (skip)' '
|
|
|
|
git reset --hard D &&
|
|
|
|
clear_hook_input &&
|
|
|
|
test_fail_interactive_rebase "2" --onto A B &&
|
|
|
|
echo D > foo &&
|
|
|
|
git add foo &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo rebase >expected.args &&
|
2015-05-22 15:41:31 +00:00
|
|
|
cat >expected.data <<-EOF &&
|
|
|
|
$(git rev-parse D) $(git rev-parse HEAD)
|
|
|
|
EOF
|
2010-03-12 17:04:30 +00:00
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git rebase -i (squash)' '
|
|
|
|
git reset --hard D &&
|
|
|
|
clear_hook_input &&
|
|
|
|
test_fail_interactive_rebase "1 squash 2" --onto A B &&
|
|
|
|
echo C > foo &&
|
|
|
|
git add foo &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo rebase >expected.args &&
|
2015-05-22 15:41:31 +00:00
|
|
|
cat >expected.data <<-EOF &&
|
|
|
|
$(git rev-parse C) $(git rev-parse HEAD)
|
|
|
|
$(git rev-parse D) $(git rev-parse HEAD)
|
|
|
|
EOF
|
2010-03-12 17:04:30 +00:00
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git rebase -i (fixup without conflict)' '
|
|
|
|
git reset --hard D &&
|
|
|
|
clear_hook_input &&
|
|
|
|
FAKE_LINES="1 fixup 2" git rebase -i B &&
|
|
|
|
echo rebase >expected.args &&
|
2015-05-22 15:41:31 +00:00
|
|
|
cat >expected.data <<-EOF &&
|
|
|
|
$(git rev-parse C) $(git rev-parse HEAD)
|
|
|
|
$(git rev-parse D) $(git rev-parse HEAD)
|
|
|
|
EOF
|
2010-03-12 17:04:30 +00:00
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
2010-03-28 19:36:00 +00:00
|
|
|
test_expect_success 'git rebase -i (double edit)' '
|
|
|
|
git reset --hard D &&
|
|
|
|
clear_hook_input &&
|
|
|
|
FAKE_LINES="edit 1 edit 2" git rebase -i B &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo something > foo &&
|
|
|
|
git add foo &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo rebase >expected.args &&
|
2015-05-22 15:41:31 +00:00
|
|
|
cat >expected.data <<-EOF &&
|
|
|
|
$(git rev-parse C) $(git rev-parse HEAD^)
|
|
|
|
$(git rev-parse D) $(git rev-parse HEAD)
|
|
|
|
EOF
|
2010-03-28 19:36:00 +00:00
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
2015-05-22 13:15:49 +00:00
|
|
|
test_expect_success 'git rebase -i (exec)' '
|
2015-05-22 13:15:50 +00:00
|
|
|
git reset --hard D &&
|
|
|
|
clear_hook_input &&
|
|
|
|
FAKE_LINES="edit 1 exec_false 2" git rebase -i B &&
|
|
|
|
echo something >bar &&
|
|
|
|
git add bar &&
|
|
|
|
# Fails because of exec false
|
|
|
|
test_must_fail git rebase --continue &&
|
|
|
|
git rebase --continue &&
|
|
|
|
echo rebase >expected.args &&
|
2015-05-22 15:41:31 +00:00
|
|
|
cat >expected.data <<-EOF &&
|
|
|
|
$(git rev-parse C) $(git rev-parse HEAD^)
|
|
|
|
$(git rev-parse D) $(git rev-parse HEAD)
|
|
|
|
EOF
|
2015-05-22 13:15:50 +00:00
|
|
|
verify_hook_input
|
|
|
|
'
|
|
|
|
|
2010-03-12 17:04:28 +00:00
|
|
|
test_done
|