2007-09-01 09:25:27 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='messages from rebase operation'
|
|
|
|
|
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
|
|
|
|
|
2007-09-01 09:25:27 +02:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2013-06-07 08:11:42 +02:00
|
|
|
test_expect_success 'setup' '
|
|
|
|
test_commit O fileO &&
|
|
|
|
test_commit X fileX &&
|
|
|
|
test_commit A fileA &&
|
|
|
|
test_commit B fileB &&
|
|
|
|
test_commit Y fileY &&
|
2007-09-01 09:25:27 +02:00
|
|
|
|
2013-06-07 08:11:42 +02:00
|
|
|
git checkout -b topic O &&
|
|
|
|
git cherry-pick A B &&
|
|
|
|
test_commit Z fileZ &&
|
2009-03-01 23:11:38 +01:00
|
|
|
git tag start
|
2007-09-01 09:25:27 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase -m' '
|
2020-11-19 00:44:25 +01:00
|
|
|
git rebase -m main >actual &&
|
2020-02-15 22:36:26 +01:00
|
|
|
test_must_be_empty actual
|
2007-09-01 09:25:27 +02:00
|
|
|
'
|
|
|
|
|
2020-11-19 00:44:25 +01:00
|
|
|
test_expect_success 'rebase against main twice' '
|
|
|
|
git rebase --apply main >out &&
|
2013-06-07 08:11:43 +02:00
|
|
|
test_i18ngrep "Current branch topic is up to date" out
|
|
|
|
'
|
|
|
|
|
2020-11-19 00:44:25 +01:00
|
|
|
test_expect_success 'rebase against main twice with --force' '
|
|
|
|
git rebase --force-rebase --apply main >out &&
|
2013-06-07 08:11:43 +02:00
|
|
|
test_i18ngrep "Current branch topic is up to date, rebase forced" out
|
|
|
|
'
|
|
|
|
|
2020-11-19 00:44:25 +01:00
|
|
|
test_expect_success 'rebase against main twice from another branch' '
|
2013-06-07 08:11:43 +02:00
|
|
|
git checkout topic^ &&
|
2020-11-19 00:44:25 +01:00
|
|
|
git rebase --apply main topic >out &&
|
2013-06-07 08:11:43 +02:00
|
|
|
test_i18ngrep "Current branch topic is up to date" out
|
|
|
|
'
|
|
|
|
|
2020-11-19 00:44:25 +01:00
|
|
|
test_expect_success 'rebase fast-forward to main' '
|
2013-06-07 08:11:43 +02:00
|
|
|
git checkout topic^ &&
|
2020-02-15 22:36:41 +01:00
|
|
|
git rebase --apply topic >out &&
|
2013-06-07 08:11:43 +02:00
|
|
|
test_i18ngrep "Fast-forwarded HEAD to topic" out
|
|
|
|
'
|
|
|
|
|
2009-03-01 23:11:38 +01:00
|
|
|
test_expect_success 'rebase --stat' '
|
2010-10-31 02:46:54 +01:00
|
|
|
git reset --hard start &&
|
2020-11-19 00:44:25 +01:00
|
|
|
git rebase --stat main >diffstat.txt &&
|
2020-11-09 01:09:21 +01:00
|
|
|
grep "^ fileX | *1 +$" diffstat.txt
|
2009-03-01 23:11:38 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase w/config rebase.stat' '
|
2010-10-31 02:46:54 +01:00
|
|
|
git reset --hard start &&
|
2020-11-09 01:09:21 +01:00
|
|
|
git config rebase.stat true &&
|
2020-11-19 00:44:25 +01:00
|
|
|
git rebase main >diffstat.txt &&
|
2020-11-09 01:09:21 +01:00
|
|
|
grep "^ fileX | *1 +$" diffstat.txt
|
2009-03-01 23:11:38 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase -n overrides config rebase.stat config' '
|
2010-10-31 02:46:54 +01:00
|
|
|
git reset --hard start &&
|
2020-11-09 01:09:21 +01:00
|
|
|
git config rebase.stat true &&
|
2020-11-19 00:44:25 +01:00
|
|
|
git rebase -n main >diffstat.txt &&
|
2020-11-09 01:09:21 +01:00
|
|
|
! grep "^ fileX | *1 +$" diffstat.txt
|
2009-03-01 23:11:38 +01:00
|
|
|
'
|
|
|
|
|
2012-05-30 18:39:42 +02:00
|
|
|
test_expect_success 'rebase --onto outputs the invalid ref' '
|
|
|
|
test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
|
2012-07-25 16:53:08 +02:00
|
|
|
test_i18ngrep "invalid-ref" err
|
2012-05-30 18:39:42 +02:00
|
|
|
'
|
|
|
|
|
2018-11-14 17:25:31 +01:00
|
|
|
test_expect_success 'error out early upon -C<n> or --whitespace=<bad>' '
|
|
|
|
test_must_fail git rebase -Cnot-a-number HEAD 2>err &&
|
|
|
|
test_i18ngrep "numerical value" err &&
|
|
|
|
test_must_fail git rebase --whitespace=bad HEAD 2>err &&
|
|
|
|
test_i18ngrep "Invalid whitespace option" err
|
|
|
|
'
|
|
|
|
|
2018-11-29 20:09:21 +01:00
|
|
|
test_expect_success 'GIT_REFLOG_ACTION' '
|
|
|
|
git checkout start &&
|
|
|
|
test_commit reflog-onto &&
|
|
|
|
git checkout -b reflog-topic start &&
|
|
|
|
test_commit reflog-to-rebase &&
|
|
|
|
|
2020-04-07 18:59:23 +02:00
|
|
|
git rebase reflog-onto &&
|
2018-11-29 20:09:21 +01:00
|
|
|
git log -g --format=%gs -3 >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
2020-04-07 18:59:23 +02:00
|
|
|
rebase (finish): returning to refs/heads/reflog-topic
|
|
|
|
rebase (pick): reflog-to-rebase
|
|
|
|
rebase (start): checkout reflog-onto
|
2018-11-29 20:09:21 +01:00
|
|
|
EOF
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
git checkout -b reflog-prefix reflog-to-rebase &&
|
2020-04-07 18:59:23 +02:00
|
|
|
GIT_REFLOG_ACTION=change-the-reflog git rebase reflog-onto &&
|
2018-11-29 20:09:21 +01:00
|
|
|
git log -g --format=%gs -3 >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
2020-04-07 18:59:23 +02:00
|
|
|
change-the-reflog (finish): returning to refs/heads/reflog-prefix
|
|
|
|
change-the-reflog (pick): reflog-to-rebase
|
|
|
|
change-the-reflog (start): checkout reflog-onto
|
2018-11-29 20:09:21 +01:00
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2022-01-26 14:05:47 +01:00
|
|
|
test_expect_success 'rebase --apply reflog' '
|
|
|
|
git checkout -b reflog-apply start &&
|
|
|
|
old_head_reflog="$(git log -g --format=%gs -1 HEAD)" &&
|
|
|
|
|
|
|
|
git rebase --apply Y &&
|
|
|
|
|
|
|
|
git log -g --format=%gs -4 HEAD >actual &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
rebase finished: returning to refs/heads/reflog-apply
|
|
|
|
rebase: Z
|
|
|
|
rebase: checkout Y
|
|
|
|
$old_head_reflog
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
git log -g --format=%gs -2 reflog-apply >actual &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
rebase finished: refs/heads/reflog-apply onto $(git rev-parse Y)
|
|
|
|
branch: Created from start
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2018-11-29 14:01:54 +01:00
|
|
|
test_expect_success 'rebase -i onto unrelated history' '
|
|
|
|
git init unrelated &&
|
|
|
|
test_commit -C unrelated 1 &&
|
|
|
|
git -C unrelated remote add -f origin "$PWD" &&
|
2020-11-19 00:44:25 +01:00
|
|
|
git -C unrelated branch --set-upstream-to=origin/main &&
|
2018-11-29 14:01:54 +01:00
|
|
|
git -C unrelated -c core.editor=true rebase -i -v --stat >actual &&
|
|
|
|
test_i18ngrep "Changes to " actual &&
|
|
|
|
test_i18ngrep "5 files changed" actual
|
|
|
|
'
|
|
|
|
|
2007-09-01 09:25:27 +02:00
|
|
|
test_done
|