2010-03-21 23:34:38 +08:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2010 Erick Mattos
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='git checkout --orphan
|
|
|
|
|
|
|
|
Main Tests for --orphan functionality.'
|
|
|
|
|
2020-11-19 07:44:22 +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
|
|
|
|
|
2021-11-17 02:27:38 +08:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2010-03-21 23:34:38 +08:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
TEST_FILE=foo
|
|
|
|
|
|
|
|
test_expect_success 'Setup' '
|
|
|
|
echo "Initial" >"$TEST_FILE" &&
|
|
|
|
git add "$TEST_FILE" &&
|
2010-10-31 09:46:54 +08:00
|
|
|
git commit -m "First Commit" &&
|
2010-03-21 23:34:38 +08:00
|
|
|
test_tick &&
|
|
|
|
echo "State 1" >>"$TEST_FILE" &&
|
|
|
|
git add "$TEST_FILE" &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "Second Commit"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--orphan creates a new orphan branch from HEAD' '
|
|
|
|
git checkout --orphan alpha &&
|
|
|
|
test_must_fail git rev-parse --verify HEAD &&
|
|
|
|
test "refs/heads/alpha" = "$(git symbolic-ref HEAD)" &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "Third Commit" &&
|
|
|
|
test_must_fail git rev-parse --verify HEAD^ &&
|
2020-11-19 07:44:22 +08:00
|
|
|
git diff-tree --quiet main alpha
|
2010-03-21 23:34:38 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--orphan creates a new orphan branch from <start_point>' '
|
2020-11-19 07:44:22 +08:00
|
|
|
git checkout main &&
|
|
|
|
git checkout --orphan beta main^ &&
|
2010-03-21 23:34:38 +08:00
|
|
|
test_must_fail git rev-parse --verify HEAD &&
|
|
|
|
test "refs/heads/beta" = "$(git symbolic-ref HEAD)" &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "Fourth Commit" &&
|
|
|
|
test_must_fail git rev-parse --verify HEAD^ &&
|
2020-11-19 07:44:22 +08:00
|
|
|
git diff-tree --quiet main^ beta
|
2010-03-21 23:34:38 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--orphan must be rejected with -b' '
|
2020-11-19 07:44:22 +08:00
|
|
|
git checkout main &&
|
2010-03-21 23:34:38 +08:00
|
|
|
test_must_fail git checkout --orphan new -b newer &&
|
2020-11-19 07:44:22 +08:00
|
|
|
test refs/heads/main = "$(git symbolic-ref HEAD)"
|
2010-03-21 23:34:38 +08:00
|
|
|
'
|
|
|
|
|
2010-05-22 08:28:37 +08:00
|
|
|
test_expect_success '--orphan must be rejected with -t' '
|
2020-11-19 07:44:22 +08:00
|
|
|
git checkout main &&
|
|
|
|
test_must_fail git checkout --orphan new -t main &&
|
|
|
|
test refs/heads/main = "$(git symbolic-ref HEAD)"
|
2010-05-22 08:28:37 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--orphan ignores branch.autosetupmerge' '
|
2020-11-19 07:44:22 +08:00
|
|
|
git checkout main &&
|
2010-05-22 08:28:37 +08:00
|
|
|
git config branch.autosetupmerge always &&
|
|
|
|
git checkout --orphan gamma &&
|
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 11:30:23 +08:00
|
|
|
test_cmp_config "" --default "" branch.gamma.merge &&
|
2010-05-22 08:28:37 +08:00
|
|
|
test refs/heads/gamma = "$(git symbolic-ref HEAD)" &&
|
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 11:30:23 +08:00
|
|
|
test_must_fail git rev-parse --verify HEAD^ &&
|
|
|
|
git checkout main &&
|
|
|
|
git config branch.autosetupmerge inherit &&
|
|
|
|
git checkout --orphan eta &&
|
|
|
|
test_cmp_config "" --default "" branch.eta.merge &&
|
|
|
|
test_cmp_config "" --default "" branch.eta.remote &&
|
|
|
|
echo refs/heads/eta >expected &&
|
|
|
|
git symbolic-ref HEAD >actual &&
|
|
|
|
test_cmp expected actual &&
|
2010-05-22 08:28:37 +08:00
|
|
|
test_must_fail git rev-parse --verify HEAD^
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--orphan makes reflog by default' '
|
2020-11-19 07:44:22 +08:00
|
|
|
git checkout main &&
|
2010-05-22 08:28:37 +08:00
|
|
|
git config --unset core.logAllRefUpdates &&
|
|
|
|
git checkout --orphan delta &&
|
2010-07-22 03:47:48 +08:00
|
|
|
test_must_fail git rev-parse --verify delta@{0} &&
|
2010-05-22 08:28:37 +08:00
|
|
|
git commit -m Delta &&
|
2010-07-22 03:47:48 +08:00
|
|
|
git rev-parse --verify delta@{0}
|
2010-05-22 08:28:37 +08:00
|
|
|
'
|
|
|
|
|
2024-01-20 04:18:50 +08:00
|
|
|
test_expect_success '--orphan does not make reflog when core.logAllRefUpdates = false' '
|
2020-11-19 07:44:22 +08:00
|
|
|
git checkout main &&
|
2010-05-22 08:28:37 +08:00
|
|
|
git config core.logAllRefUpdates false &&
|
|
|
|
git checkout --orphan epsilon &&
|
2010-07-22 03:47:48 +08:00
|
|
|
test_must_fail git rev-parse --verify epsilon@{0} &&
|
2010-05-22 08:28:37 +08:00
|
|
|
git commit -m Epsilon &&
|
2010-07-22 03:47:48 +08:00
|
|
|
test_must_fail git rev-parse --verify epsilon@{0}
|
2010-05-22 08:28:37 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--orphan with -l makes reflog when core.logAllRefUpdates = false' '
|
2020-11-19 07:44:22 +08:00
|
|
|
git checkout main &&
|
2010-05-22 08:28:37 +08:00
|
|
|
git checkout -l --orphan zeta &&
|
2010-07-22 03:47:48 +08:00
|
|
|
test_must_fail git rev-parse --verify zeta@{0} &&
|
2010-05-22 08:28:37 +08:00
|
|
|
git commit -m Zeta &&
|
2010-07-22 03:47:48 +08:00
|
|
|
git rev-parse --verify zeta@{0}
|
2010-05-22 08:28:37 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog' '
|
2020-11-19 07:44:22 +08:00
|
|
|
git checkout main &&
|
2010-05-22 08:28:37 +08:00
|
|
|
git checkout -l --orphan eta &&
|
2010-07-22 03:47:48 +08:00
|
|
|
test_must_fail git rev-parse --verify eta@{0} &&
|
2020-11-19 07:44:22 +08:00
|
|
|
git checkout main &&
|
2010-07-22 03:47:48 +08:00
|
|
|
test_must_fail git rev-parse --verify eta@{0}
|
2010-05-22 08:28:37 +08:00
|
|
|
'
|
|
|
|
|
2010-03-21 23:34:38 +08:00
|
|
|
test_expect_success '--orphan is rejected with an existing name' '
|
2020-11-19 07:44:22 +08:00
|
|
|
git checkout main &&
|
|
|
|
test_must_fail git checkout --orphan main &&
|
|
|
|
test refs/heads/main = "$(git symbolic-ref HEAD)"
|
2010-03-21 23:34:38 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--orphan refuses to switch if a merge is needed' '
|
2020-11-19 07:44:22 +08:00
|
|
|
git checkout main &&
|
2010-03-21 23:34:38 +08:00
|
|
|
git reset --hard &&
|
|
|
|
echo local >>"$TEST_FILE" &&
|
|
|
|
cat "$TEST_FILE" >"$TEST_FILE.saved" &&
|
2020-11-19 07:44:22 +08:00
|
|
|
test_must_fail git checkout --orphan new main^ &&
|
|
|
|
test refs/heads/main = "$(git symbolic-ref HEAD)" &&
|
2010-03-21 23:34:38 +08:00
|
|
|
test_cmp "$TEST_FILE" "$TEST_FILE.saved" &&
|
|
|
|
git diff-index --quiet --cached HEAD &&
|
|
|
|
git reset --hard
|
|
|
|
'
|
|
|
|
|
2012-06-26 23:06:42 +08:00
|
|
|
test_expect_success 'cannot --detach on an unborn branch' '
|
2020-11-19 07:44:22 +08:00
|
|
|
git checkout main &&
|
2012-06-26 23:06:42 +08:00
|
|
|
git checkout --orphan new &&
|
|
|
|
test_must_fail git checkout --detach
|
|
|
|
'
|
|
|
|
|
2010-03-21 23:34:38 +08:00
|
|
|
test_done
|