2008-10-06 13:14:24 +08:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='git rebase with its hook(s)'
|
|
|
|
|
|
2020-11-19 07:44:25 +08: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 07:44:19 +08:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
|
2008-10-06 13:14:24 +08:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
|
echo hello >file &&
|
|
|
|
|
git add file &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -m initial &&
|
|
|
|
|
echo goodbye >file &&
|
|
|
|
|
git add file &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -m second &&
|
|
|
|
|
git checkout -b side HEAD^ &&
|
|
|
|
|
echo world >git &&
|
|
|
|
|
git add git &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -m side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
git checkout main &&
|
2008-10-06 13:14:24 +08:00
|
|
|
git log --pretty=oneline --abbrev-commit --graph --all &&
|
|
|
|
|
git branch test side
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rebase' '
|
|
|
|
|
git checkout test &&
|
|
|
|
|
git reset --hard side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
git rebase main &&
|
2008-10-06 13:14:24 +08:00
|
|
|
test "z$(cat git)" = zworld
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rebase -i' '
|
|
|
|
|
git checkout test &&
|
|
|
|
|
git reset --hard side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
EDITOR=true git rebase -i main &&
|
2008-10-06 13:14:24 +08:00
|
|
|
test "z$(cat git)" = zworld
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup pre-rebase hook' '
|
|
|
|
|
mkdir -p .git/hooks &&
|
|
|
|
|
cat >.git/hooks/pre-rebase <<EOF &&
|
|
|
|
|
#!$SHELL_PATH
|
|
|
|
|
echo "\$1,\$2" >.git/PRE-REBASE-INPUT
|
|
|
|
|
EOF
|
|
|
|
|
chmod +x .git/hooks/pre-rebase
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'pre-rebase hook gets correct input (1)' '
|
|
|
|
|
git checkout test &&
|
|
|
|
|
git reset --hard side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
git rebase main &&
|
2008-10-06 13:14:24 +08:00
|
|
|
test "z$(cat git)" = zworld &&
|
2020-11-19 07:44:25 +08:00
|
|
|
test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
|
2008-10-06 13:14:24 +08:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'pre-rebase hook gets correct input (2)' '
|
|
|
|
|
git checkout test &&
|
|
|
|
|
git reset --hard side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
git rebase main test &&
|
2008-10-06 13:14:24 +08:00
|
|
|
test "z$(cat git)" = zworld &&
|
2020-11-19 07:44:25 +08:00
|
|
|
test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
|
2008-10-06 13:14:24 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'pre-rebase hook gets correct input (3)' '
|
|
|
|
|
git checkout test &&
|
|
|
|
|
git reset --hard side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
git checkout main &&
|
|
|
|
|
git rebase main test &&
|
2008-10-06 13:14:24 +08:00
|
|
|
test "z$(cat git)" = zworld &&
|
2020-11-19 07:44:25 +08:00
|
|
|
test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
|
2008-10-06 13:14:24 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'pre-rebase hook gets correct input (4)' '
|
|
|
|
|
git checkout test &&
|
|
|
|
|
git reset --hard side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
EDITOR=true git rebase -i main &&
|
2008-10-06 13:14:24 +08:00
|
|
|
test "z$(cat git)" = zworld &&
|
2020-11-19 07:44:25 +08:00
|
|
|
test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
|
2008-10-06 13:14:24 +08:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'pre-rebase hook gets correct input (5)' '
|
|
|
|
|
git checkout test &&
|
|
|
|
|
git reset --hard side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
EDITOR=true git rebase -i main test &&
|
2008-10-06 13:14:24 +08:00
|
|
|
test "z$(cat git)" = zworld &&
|
2020-11-19 07:44:25 +08:00
|
|
|
test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
|
2008-10-06 13:14:24 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'pre-rebase hook gets correct input (6)' '
|
|
|
|
|
git checkout test &&
|
|
|
|
|
git reset --hard side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
git checkout main &&
|
|
|
|
|
EDITOR=true git rebase -i main test &&
|
2008-10-06 13:14:24 +08:00
|
|
|
test "z$(cat git)" = zworld &&
|
2020-11-19 07:44:25 +08:00
|
|
|
test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
|
2008-10-06 13:14:24 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup pre-rebase hook that fails' '
|
|
|
|
|
mkdir -p .git/hooks &&
|
|
|
|
|
cat >.git/hooks/pre-rebase <<EOF &&
|
|
|
|
|
#!$SHELL_PATH
|
|
|
|
|
false
|
|
|
|
|
EOF
|
|
|
|
|
chmod +x .git/hooks/pre-rebase
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'pre-rebase hook stops rebase (1)' '
|
|
|
|
|
git checkout test &&
|
|
|
|
|
git reset --hard side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
test_must_fail git rebase main &&
|
2008-10-06 13:14:24 +08:00
|
|
|
test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
|
|
|
|
|
test 0 = $(git rev-list HEAD...side | wc -l)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'pre-rebase hook stops rebase (2)' '
|
|
|
|
|
git checkout test &&
|
|
|
|
|
git reset --hard side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
test_must_fail env EDITOR=: git rebase -i main &&
|
2008-10-06 13:14:24 +08:00
|
|
|
test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
|
|
|
|
|
test 0 = $(git rev-list HEAD...side | wc -l)
|
|
|
|
|
'
|
|
|
|
|
|
2008-10-06 13:14:29 +08:00
|
|
|
test_expect_success 'rebase --no-verify overrides pre-rebase (1)' '
|
|
|
|
|
git checkout test &&
|
|
|
|
|
git reset --hard side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
git rebase --no-verify main &&
|
2008-10-06 13:14:29 +08:00
|
|
|
test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
|
|
|
|
|
test "z$(cat git)" = zworld
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'rebase --no-verify overrides pre-rebase (2)' '
|
|
|
|
|
git checkout test &&
|
|
|
|
|
git reset --hard side &&
|
2020-11-19 07:44:25 +08:00
|
|
|
EDITOR=true git rebase --no-verify -i main &&
|
2008-10-06 13:14:29 +08:00
|
|
|
test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
|
|
|
|
|
test "z$(cat git)" = zworld
|
|
|
|
|
'
|
|
|
|
|
|
2008-10-06 13:14:24 +08:00
|
|
|
test_done
|
