2019-03-29 10:39:17 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='switch basic functionality'
|
|
|
|
|
2020-11-18 23:44:22 +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
|
|
|
|
|
2019-03-29 10:39:17 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
test_commit first &&
|
|
|
|
git branch first-branch &&
|
|
|
|
test_commit second &&
|
|
|
|
test_commit third &&
|
|
|
|
git remote add origin nohost:/nopath &&
|
|
|
|
git update-ref refs/remotes/origin/foo first-branch
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'switch branch no arguments' '
|
|
|
|
test_must_fail git switch
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'switch branch' '
|
|
|
|
git switch first-branch &&
|
|
|
|
test_path_is_missing second.t
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'switch and detach' '
|
2020-11-18 23:44:22 +00:00
|
|
|
test_when_finished git switch main &&
|
|
|
|
test_must_fail git switch main^{commit} &&
|
|
|
|
git switch --detach main^{commit} &&
|
2019-03-29 10:39:17 +00:00
|
|
|
test_must_fail git symbolic-ref HEAD
|
|
|
|
'
|
|
|
|
|
2022-02-26 06:12:13 +00:00
|
|
|
test_expect_success 'suggestion to detach' '
|
|
|
|
test_must_fail git switch main^{commit} 2>stderr &&
|
|
|
|
grep "try again with the --detach option" stderr
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'suggestion to detach is suppressed with advice.suggestDetachingHead=false' '
|
|
|
|
test_config advice.suggestDetachingHead false &&
|
|
|
|
test_must_fail git switch main^{commit} 2>stderr &&
|
|
|
|
! grep "try again with the --detach option" stderr
|
|
|
|
'
|
|
|
|
|
2019-03-29 10:39:17 +00:00
|
|
|
test_expect_success 'switch and detach current branch' '
|
2020-11-18 23:44:22 +00:00
|
|
|
test_when_finished git switch main &&
|
|
|
|
git switch main &&
|
2019-03-29 10:39:17 +00:00
|
|
|
git switch --detach &&
|
|
|
|
test_must_fail git symbolic-ref HEAD
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'switch and create branch' '
|
2020-11-18 23:44:22 +00:00
|
|
|
test_when_finished git switch main &&
|
|
|
|
git switch -c temp main^ &&
|
|
|
|
test_cmp_rev main^ refs/heads/temp &&
|
2019-03-29 10:39:17 +00:00
|
|
|
echo refs/heads/temp >expected-branch &&
|
|
|
|
git symbolic-ref HEAD >actual-branch &&
|
|
|
|
test_cmp expected-branch actual-branch
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'force create branch from HEAD' '
|
2020-11-18 23:44:22 +00:00
|
|
|
test_when_finished git switch main &&
|
|
|
|
git switch --detach main &&
|
2019-03-29 10:39:17 +00:00
|
|
|
test_must_fail git switch -c temp &&
|
|
|
|
git switch -C temp &&
|
2020-11-18 23:44:22 +00:00
|
|
|
test_cmp_rev main refs/heads/temp &&
|
2019-03-29 10:39:17 +00:00
|
|
|
echo refs/heads/temp >expected-branch &&
|
|
|
|
git symbolic-ref HEAD >actual-branch &&
|
|
|
|
test_cmp expected-branch actual-branch
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'new orphan branch from empty' '
|
2020-11-18 23:44:22 +00:00
|
|
|
test_when_finished git switch main &&
|
2019-03-29 10:39:17 +00:00
|
|
|
test_must_fail git switch --orphan new-orphan HEAD &&
|
|
|
|
git switch --orphan new-orphan &&
|
|
|
|
test_commit orphan &&
|
|
|
|
git cat-file commit refs/heads/new-orphan >commit &&
|
|
|
|
! grep ^parent commit &&
|
|
|
|
git ls-files >tracked-files &&
|
|
|
|
echo orphan.t >expected &&
|
|
|
|
test_cmp expected tracked-files
|
|
|
|
'
|
|
|
|
|
2020-05-21 02:07:12 +00:00
|
|
|
test_expect_success 'orphan branch works with --discard-changes' '
|
2020-11-18 23:44:22 +00:00
|
|
|
test_when_finished git switch main &&
|
2020-05-21 02:07:12 +00:00
|
|
|
echo foo >foo.txt &&
|
|
|
|
git switch --discard-changes --orphan new-orphan2 &&
|
|
|
|
git ls-files >tracked-files &&
|
|
|
|
test_must_be_empty tracked-files
|
|
|
|
'
|
|
|
|
|
2019-03-29 10:39:17 +00:00
|
|
|
test_expect_success 'switching ignores file of same branch name' '
|
2020-11-18 23:44:22 +00:00
|
|
|
test_when_finished git switch main &&
|
2019-03-29 10:39:17 +00:00
|
|
|
: >first-branch &&
|
|
|
|
git switch first-branch &&
|
|
|
|
echo refs/heads/first-branch >expected &&
|
|
|
|
git symbolic-ref HEAD >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2020-10-08 05:48:15 +00:00
|
|
|
test_expect_success 'guess and create branch' '
|
2020-11-18 23:44:22 +00:00
|
|
|
test_when_finished git switch main &&
|
2019-03-29 10:39:17 +00:00
|
|
|
test_must_fail git switch --no-guess foo &&
|
2020-10-08 05:48:15 +00:00
|
|
|
test_config checkout.guess false &&
|
|
|
|
test_must_fail git switch foo &&
|
|
|
|
test_config checkout.guess true &&
|
2019-03-29 10:39:17 +00:00
|
|
|
git switch foo &&
|
|
|
|
echo refs/heads/foo >expected &&
|
|
|
|
git symbolic-ref HEAD >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'not switching when something is in progress' '
|
|
|
|
test_when_finished rm -f .git/MERGE_HEAD &&
|
|
|
|
# fake a merge-in-progress
|
|
|
|
cp .git/HEAD .git/MERGE_HEAD &&
|
|
|
|
test_must_fail git switch -d @^
|
|
|
|
'
|
|
|
|
|
branch: add flags and config to inherit tracking
It can be helpful when creating a new branch to use the existing
tracking configuration from the branch point. However, there is
currently not a method to automatically do so.
Teach git-{branch,checkout,switch} an "inherit" argument to the
"--track" option. When this is set, creating a new branch will cause the
tracking configuration to default to the configuration of the branch
point, if set.
For example, if branch "main" tracks "origin/main", and we run
`git checkout --track=inherit -b feature main`, then branch "feature"
will track "origin/main". Thus, `git status` will show us how far
ahead/behind we are from origin, and `git pull` will pull from origin.
This is particularly useful when creating branches across many
submodules, such as with `git submodule foreach ...` (or if running with
a patch such as [1], which we use at $job), as it avoids having to
manually set tracking info for each submodule.
Since we've added an argument to "--track", also add "--track=direct" as
another way to explicitly get the original "--track" behavior ("--track"
without an argument still works as well).
Finally, teach branch.autoSetupMerge a new "inherit" option. When this
is set, "--track=inherit" becomes the default behavior.
[1]: https://lore.kernel.org/git/20180927221603.148025-1-sbeller@google.com/
Signed-off-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-12-21 03:30:23 +00:00
|
|
|
test_expect_success 'tracking info copied with autoSetupMerge=inherit' '
|
|
|
|
# default config does not copy tracking info
|
|
|
|
git switch -c foo-no-inherit foo &&
|
|
|
|
test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
|
|
|
|
test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
|
|
|
|
# with --track=inherit, we copy tracking info from foo
|
|
|
|
git switch --track=inherit -c foo2 foo &&
|
|
|
|
test_cmp_config origin branch.foo2.remote &&
|
|
|
|
test_cmp_config refs/heads/foo branch.foo2.merge &&
|
|
|
|
# with autoSetupMerge=inherit, we do the same
|
|
|
|
test_config branch.autoSetupMerge inherit &&
|
|
|
|
git switch -c foo3 foo &&
|
|
|
|
test_cmp_config origin branch.foo3.remote &&
|
|
|
|
test_cmp_config refs/heads/foo branch.foo3.merge &&
|
|
|
|
# with --track, we override autoSetupMerge
|
|
|
|
git switch --track -c foo4 foo &&
|
|
|
|
test_cmp_config . branch.foo4.remote &&
|
|
|
|
test_cmp_config refs/heads/foo branch.foo4.merge &&
|
|
|
|
# and --track=direct does as well
|
|
|
|
git switch --track=direct -c foo5 foo &&
|
|
|
|
test_cmp_config . branch.foo5.remote &&
|
|
|
|
test_cmp_config refs/heads/foo branch.foo5.merge &&
|
|
|
|
# no tracking info to inherit from main
|
|
|
|
git switch -c main2 main &&
|
|
|
|
test_cmp_config "" --default "" branch.main2.remote &&
|
|
|
|
test_cmp_config "" --default "" branch.main2.merge
|
|
|
|
'
|
|
|
|
|
2023-02-25 14:22:23 +00:00
|
|
|
test_expect_success 'switch back when temporarily detached and checked out elsewhere ' '
|
|
|
|
test_when_finished "
|
|
|
|
git worktree remove wt1 ||:
|
|
|
|
git worktree remove wt2 ||:
|
|
|
|
git checkout - ||:
|
|
|
|
git branch -D shared ||:
|
|
|
|
" &&
|
|
|
|
git checkout -b shared &&
|
|
|
|
test_commit shared-first &&
|
|
|
|
HASH1=$(git rev-parse --verify HEAD) &&
|
|
|
|
test_commit shared-second &&
|
|
|
|
test_commit shared-third &&
|
|
|
|
HASH2=$(git rev-parse --verify HEAD) &&
|
|
|
|
git worktree add wt1 -f shared &&
|
|
|
|
git -C wt1 bisect start &&
|
|
|
|
git -C wt1 bisect good $HASH1 &&
|
|
|
|
git -C wt1 bisect bad $HASH2 &&
|
|
|
|
git worktree add wt2 -f shared &&
|
|
|
|
git -C wt2 bisect start &&
|
|
|
|
git -C wt2 bisect good $HASH1 &&
|
|
|
|
git -C wt2 bisect bad $HASH2 &&
|
|
|
|
# we test in both worktrees to ensure that works
|
|
|
|
# as expected with "first" and "next" worktrees
|
|
|
|
test_must_fail git -C wt1 switch shared &&
|
|
|
|
git -C wt1 switch --ignore-other-worktrees shared &&
|
|
|
|
test_must_fail git -C wt2 switch shared &&
|
|
|
|
git -C wt2 switch --ignore-other-worktrees shared
|
|
|
|
'
|
|
|
|
|
2019-03-29 10:39:17 +00:00
|
|
|
test_done
|