2006-06-28 20:47:28 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2006 Junio C Hamano
|
|
|
|
#
|
|
|
|
|
2008-09-03 10:59:33 +02:00
|
|
|
test_description='git checkout tests.
|
2007-03-29 10:02:50 +02:00
|
|
|
|
2020-11-19 00:44:39 +01:00
|
|
|
Creates main, forks renamer and side branches from it.
|
2007-03-29 10:02:50 +02:00
|
|
|
Test switching across them.
|
|
|
|
|
2020-11-19 00:44:39 +01:00
|
|
|
! [main] Initial A one, A two
|
2007-03-29 10:02:50 +02:00
|
|
|
* [renamer] Renamer R one->uno, M two
|
|
|
|
! [side] Side M one, D two, A three
|
2010-03-21 01:27:17 +01:00
|
|
|
! [simple] Simple D one, M two
|
|
|
|
----
|
|
|
|
+ [simple] Simple D one, M two
|
|
|
|
+ [side] Side M one, D two, A three
|
|
|
|
* [renamer] Renamer R one->uno, M two
|
2020-11-19 00:44:39 +01:00
|
|
|
+*++ [main] Initial A one, A two
|
2007-03-29 10:02:50 +02:00
|
|
|
|
|
|
|
'
|
2006-06-28 20:47:28 +02:00
|
|
|
|
2020-11-19 00:44:39 +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
|
|
|
|
|
2006-06-28 20:47:28 +02:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2007-12-10 04:05:34 +01:00
|
|
|
test_tick
|
|
|
|
|
2006-06-28 20:47:28 +02:00
|
|
|
fill () {
|
|
|
|
for i
|
|
|
|
do
|
|
|
|
echo "$i"
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
2007-01-17 05:46:39 +01:00
|
|
|
|
2006-06-28 20:47:28 +02:00
|
|
|
test_expect_success setup '
|
2020-10-20 13:43:17 +02:00
|
|
|
fill x y z >same &&
|
2007-01-17 05:46:39 +01:00
|
|
|
fill 1 2 3 4 5 6 7 8 >one &&
|
2006-06-28 20:47:28 +02:00
|
|
|
fill a b c d e >two &&
|
2007-12-10 04:05:34 +01:00
|
|
|
git add same one two &&
|
2006-06-28 20:47:28 +02:00
|
|
|
git commit -m "Initial A one, A two" &&
|
|
|
|
|
2007-01-17 05:46:39 +01:00
|
|
|
git checkout -b renamer &&
|
|
|
|
rm -f one &&
|
|
|
|
fill 1 3 4 5 6 7 8 >uno &&
|
|
|
|
git add uno &&
|
|
|
|
fill a b c d e f >two &&
|
|
|
|
git commit -a -m "Renamer R one->uno, M two" &&
|
|
|
|
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -b side main &&
|
2007-01-17 05:46:39 +01:00
|
|
|
fill 1 2 3 4 5 6 7 >one &&
|
2006-06-28 20:47:28 +02:00
|
|
|
fill A B C D E >three &&
|
|
|
|
rm -f two &&
|
|
|
|
git update-index --add --remove one two three &&
|
|
|
|
git commit -m "Side M one, D two, A three" &&
|
|
|
|
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -b simple main &&
|
2010-03-21 01:27:17 +01:00
|
|
|
rm -f one &&
|
2020-10-20 13:43:17 +02:00
|
|
|
fill a c e >two &&
|
2010-03-21 01:27:17 +01:00
|
|
|
git commit -a -m "Simple D one, M two" &&
|
|
|
|
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main
|
2006-06-28 20:47:28 +02:00
|
|
|
'
|
|
|
|
|
2020-10-20 13:43:15 +02:00
|
|
|
test_expect_success 'checkout from non-existing branch' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -b delete-me main &&
|
2018-05-23 07:25:17 +02:00
|
|
|
git update-ref -d --no-deref refs/heads/delete-me &&
|
2006-09-25 07:24:38 +02:00
|
|
|
test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
|
|
|
test refs/heads/main = "$(git symbolic-ref HEAD)"
|
2006-09-25 07:24:38 +02:00
|
|
|
'
|
|
|
|
|
2020-10-20 13:43:15 +02:00
|
|
|
test_expect_success 'checkout with dirty tree without -m' '
|
2007-01-17 05:46:39 +01:00
|
|
|
fill 0 1 2 3 4 5 6 7 8 >one &&
|
2006-06-28 20:47:28 +02:00
|
|
|
if git checkout side
|
|
|
|
then
|
|
|
|
echo Not happy
|
|
|
|
false
|
|
|
|
else
|
|
|
|
echo "happy - failed correctly"
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
|
2020-10-20 13:43:15 +02:00
|
|
|
test_expect_success 'checkout with unrelated dirty tree without -m' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -f main &&
|
2007-12-10 04:05:34 +01:00
|
|
|
fill 0 1 2 3 4 5 6 7 8 >same &&
|
2015-03-20 11:12:55 +01:00
|
|
|
cp same kept &&
|
2007-12-10 04:05:34 +01:00
|
|
|
git checkout side >messages &&
|
2015-03-20 11:12:55 +01:00
|
|
|
test_cmp same kept &&
|
|
|
|
printf "M\t%s\n" same >messages.expect &&
|
2008-03-12 22:36:36 +01:00
|
|
|
test_cmp messages.expect messages
|
2007-12-10 04:05:34 +01:00
|
|
|
'
|
|
|
|
|
2020-10-20 13:43:15 +02:00
|
|
|
test_expect_success 'checkout -m with dirty tree' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -f main &&
|
2007-11-02 01:32:04 +01:00
|
|
|
git clean -f &&
|
2006-06-28 20:47:28 +02:00
|
|
|
|
2007-01-17 05:46:39 +01:00
|
|
|
fill 0 1 2 3 4 5 6 7 8 >one &&
|
2020-10-20 13:43:17 +02:00
|
|
|
git checkout -m side >messages &&
|
2006-06-28 20:47:28 +02:00
|
|
|
|
2007-01-17 05:46:39 +01:00
|
|
|
test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
|
2006-06-28 20:47:28 +02:00
|
|
|
|
2015-03-20 11:12:55 +01:00
|
|
|
printf "M\t%s\n" one >expect.messages &&
|
2008-03-12 22:36:36 +01:00
|
|
|
test_cmp expect.messages messages &&
|
2007-12-10 04:05:34 +01:00
|
|
|
|
2020-11-19 00:44:39 +01:00
|
|
|
fill "M one" "A three" "D two" >expect.main &&
|
|
|
|
git diff --name-status main >current.main &&
|
|
|
|
test_cmp expect.main current.main &&
|
2006-06-28 20:47:28 +02:00
|
|
|
|
|
|
|
fill "M one" >expect.side &&
|
|
|
|
git diff --name-status side >current.side &&
|
2008-03-12 22:36:36 +01:00
|
|
|
test_cmp expect.side current.side &&
|
2006-06-28 20:47:28 +02:00
|
|
|
|
|
|
|
git diff --cached >current.index &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
test_must_be_empty current.index
|
2006-06-28 20:47:28 +02:00
|
|
|
'
|
|
|
|
|
2020-10-20 13:43:15 +02:00
|
|
|
test_expect_success 'checkout -m with dirty tree, renamed' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -f main && git clean -f &&
|
2007-01-17 05:46:39 +01:00
|
|
|
|
|
|
|
fill 1 2 3 4 5 7 8 >one &&
|
|
|
|
if git checkout renamer
|
|
|
|
then
|
|
|
|
echo Not happy
|
|
|
|
false
|
|
|
|
else
|
|
|
|
echo "happy - failed correctly"
|
|
|
|
fi &&
|
|
|
|
|
|
|
|
git checkout -m renamer &&
|
|
|
|
fill 1 3 4 5 7 8 >expect &&
|
2008-03-12 22:36:36 +01:00
|
|
|
test_cmp expect uno &&
|
2007-01-24 01:51:22 +01:00
|
|
|
! test -f one &&
|
|
|
|
git diff --cached >current &&
|
2018-08-19 23:57:22 +02:00
|
|
|
test_must_be_empty current
|
2007-01-24 01:51:22 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'checkout -m with merge conflict' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -f main && git clean -f &&
|
2007-01-24 01:51:22 +01:00
|
|
|
|
|
|
|
fill 1 T 3 4 5 6 S 8 >one &&
|
|
|
|
if git checkout renamer
|
|
|
|
then
|
|
|
|
echo Not happy
|
|
|
|
false
|
|
|
|
else
|
|
|
|
echo "happy - failed correctly"
|
|
|
|
fi &&
|
|
|
|
|
|
|
|
git checkout -m renamer &&
|
|
|
|
|
2020-11-19 00:44:39 +01:00
|
|
|
git diff main:one :3:uno |
|
2007-01-24 01:51:22 +01:00
|
|
|
sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
|
|
|
|
fill d2 aT d7 aS >expect &&
|
2018-10-05 23:54:04 +02:00
|
|
|
test_cmp expect current &&
|
2007-01-24 01:51:22 +01:00
|
|
|
git diff --cached two >current &&
|
2018-08-19 23:57:22 +02:00
|
|
|
test_must_be_empty current
|
2007-01-17 05:46:39 +01:00
|
|
|
'
|
|
|
|
|
2010-03-21 01:27:17 +01:00
|
|
|
test_expect_success 'format of merge conflict from checkout -m' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -f main &&
|
2020-10-20 14:11:52 +02:00
|
|
|
git clean -f &&
|
2010-03-21 01:27:17 +01:00
|
|
|
|
2020-10-20 13:43:17 +02:00
|
|
|
fill b d >two &&
|
2010-03-21 01:27:17 +01:00
|
|
|
git checkout -m simple &&
|
|
|
|
|
|
|
|
git ls-files >current &&
|
|
|
|
fill same two two two >expect &&
|
2018-10-05 23:54:04 +02:00
|
|
|
test_cmp expect current &&
|
2010-03-21 01:27:17 +01:00
|
|
|
|
|
|
|
cat <<-EOF >expect &&
|
|
|
|
<<<<<<< simple
|
|
|
|
a
|
|
|
|
c
|
|
|
|
e
|
|
|
|
=======
|
|
|
|
b
|
|
|
|
d
|
|
|
|
>>>>>>> local
|
|
|
|
EOF
|
2017-10-06 21:00:06 +02:00
|
|
|
test_cmp expect two
|
2010-03-21 01:27:17 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -f main &&
|
2020-10-20 14:11:52 +02:00
|
|
|
git reset --hard &&
|
|
|
|
git clean -f &&
|
2010-03-21 01:27:17 +01:00
|
|
|
|
2020-10-20 13:43:17 +02:00
|
|
|
fill b d >two &&
|
2010-03-21 01:27:17 +01:00
|
|
|
git checkout --merge --conflict=diff3 simple &&
|
|
|
|
|
|
|
|
cat <<-EOF >expect &&
|
|
|
|
<<<<<<< simple
|
|
|
|
a
|
|
|
|
c
|
|
|
|
e
|
2020-11-19 00:44:39 +01:00
|
|
|
||||||| main
|
2010-03-21 01:27:17 +01:00
|
|
|
a
|
|
|
|
b
|
|
|
|
c
|
|
|
|
d
|
|
|
|
e
|
|
|
|
=======
|
|
|
|
b
|
|
|
|
d
|
|
|
|
>>>>>>> local
|
|
|
|
EOF
|
2017-10-06 21:00:06 +02:00
|
|
|
test_cmp expect two
|
2010-03-21 01:27:17 +01:00
|
|
|
'
|
|
|
|
|
2014-08-13 02:03:18 +02:00
|
|
|
test_expect_success 'switch to another branch while carrying a deletion' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -f main &&
|
2020-10-20 14:11:52 +02:00
|
|
|
git reset --hard &&
|
|
|
|
git clean -f &&
|
2014-08-13 02:03:18 +02:00
|
|
|
git rm two &&
|
|
|
|
|
|
|
|
test_must_fail git checkout simple 2>errs &&
|
|
|
|
test_i18ngrep overwritten errs &&
|
|
|
|
|
2019-03-22 10:31:37 +01:00
|
|
|
test_must_fail git read-tree --quiet -m -u HEAD simple 2>errs &&
|
2019-03-22 10:31:38 +01:00
|
|
|
test_must_be_empty errs
|
2014-08-13 02:03:18 +02:00
|
|
|
'
|
|
|
|
|
2011-04-13 01:39:14 +02:00
|
|
|
test_expect_success 'checkout to detach HEAD (with advice declined)' '
|
2010-01-30 07:03:24 +01:00
|
|
|
git config advice.detachedHead false &&
|
2020-07-30 01:14:01 +02:00
|
|
|
rev=$(git rev-parse --short renamer^) &&
|
2020-10-20 14:11:52 +02:00
|
|
|
git checkout -f renamer &&
|
|
|
|
git clean -f &&
|
2007-12-10 04:05:34 +01:00
|
|
|
git checkout renamer^ 2>messages &&
|
2020-07-30 01:14:01 +02:00
|
|
|
test_i18ngrep "HEAD is now at $rev" messages &&
|
2012-04-11 13:24:01 +02:00
|
|
|
test_line_count = 1 messages &&
|
2010-01-30 07:03:24 +01:00
|
|
|
H=$(git rev-parse --verify HEAD) &&
|
2020-11-19 00:44:39 +01:00
|
|
|
M=$(git show-ref -s --verify refs/heads/main) &&
|
2010-01-30 07:03:24 +01:00
|
|
|
test "z$H" = "z$M" &&
|
|
|
|
if git symbolic-ref HEAD >/dev/null 2>&1
|
|
|
|
then
|
|
|
|
echo "OOPS, HEAD is still symbolic???"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
|
2011-04-13 01:39:14 +02:00
|
|
|
test_expect_success 'checkout to detach HEAD' '
|
2010-01-30 07:03:24 +01:00
|
|
|
git config advice.detachedHead true &&
|
2020-07-30 01:14:01 +02:00
|
|
|
rev=$(git rev-parse --short renamer^) &&
|
2020-10-20 14:11:52 +02:00
|
|
|
git checkout -f renamer &&
|
|
|
|
git clean -f &&
|
2021-01-20 19:27:59 +01:00
|
|
|
git checkout renamer^ 2>messages &&
|
2020-07-30 01:14:01 +02:00
|
|
|
grep "HEAD is now at $rev" messages &&
|
i18n: make GETTEXT_POISON a runtime option
Change the GETTEXT_POISON compile-time + runtime GIT_GETTEXT_POISON
test parameter to only be a GIT_TEST_GETTEXT_POISON=<non-empty?>
runtime parameter, to be consistent with other parameters documented
in "Running tests with special setups" in t/README.
When I added GETTEXT_POISON in bb946bba76 ("i18n: add GETTEXT_POISON
to simulate unfriendly translator", 2011-02-22) I was concerned with
ensuring that the _() function would get constant folded if NO_GETTEXT
was defined, and likewise that GETTEXT_POISON would be compiled out
unless it was defined.
But as the benchmark in my [1] shows doing a one-off runtime
getenv("GIT_TEST_[...]") is trivial, and since GETTEXT_POISON was
originally added the GIT_TEST_* env variables have become the common
idiom for turning on special test setups.
So change GETTEXT_POISON to work the same way. Now the
GETTEXT_POISON=YesPlease compile-time option is gone, and running the
tests with GIT_TEST_GETTEXT_POISON=[YesPlease|] can be toggled on/off
without recompiling.
This allows for conditionally amending tests to test with/without
poison, similar to what 859fdc0c3c ("commit-graph: define
GIT_TEST_COMMIT_GRAPH", 2018-08-29) did for GIT_TEST_COMMIT_GRAPH. Do
some of that, now we e.g. always run the t0205-gettext-poison.sh test.
I did enough there to remove the GETTEXT_POISON prerequisite, but its
inverse C_LOCALE_OUTPUT is still around, and surely some tests using
it can be converted to e.g. always set GIT_TEST_GETTEXT_POISON=.
Notes on the implementation:
* We still compile a dedicated GETTEXT_POISON build in Travis
CI. Perhaps this should be revisited and integrated into the
"linux-gcc" build, see ae59a4e44f ("travis: run tests with
GIT_TEST_SPLIT_INDEX", 2018-01-07) for prior art in that area. Then
again maybe not, see [2].
* We now skip a test in t0000-basic.sh under
GIT_TEST_GETTEXT_POISON=YesPlease that wasn't skipped before. This
test relies on C locale output, but due to an edge case in how the
previous implementation of GETTEXT_POISON worked (reading it from
GIT-BUILD-OPTIONS) wasn't enabling poison correctly. Now it does,
and needs to be skipped.
* The getenv() function is not reentrant, so out of paranoia about
code of the form:
printf(_("%s"), getenv("some-env"));
call use_gettext_poison() in our early setup in git_setup_gettext()
so we populate the "poison_requested" variable in a codepath that's
won't suffer from that race condition.
* We error out in the Makefile if you're still saying
GETTEXT_POISON=YesPlease to prompt users to change their
invocation.
* We should not print out poisoned messages during the test
initialization itself to keep it more readable, so the test library
hides the variable if set in $GIT_TEST_GETTEXT_POISON_ORIG during
setup. See [3].
See also [4] for more on the motivation behind this patch, and the
history of the GETTEXT_POISON facility.
1. https://public-inbox.org/git/871s8gd32p.fsf@evledraar.gmail.com/
2. https://public-inbox.org/git/20181102163725.GY30222@szeder.dev/
3. https://public-inbox.org/git/20181022202241.18629-2-szeder.dev@gmail.com/
4. https://public-inbox.org/git/878t2pd6yu.fsf@evledraar.gmail.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-11-08 22:15:29 +01:00
|
|
|
test_line_count -gt 1 messages &&
|
2007-03-29 10:02:50 +02:00
|
|
|
H=$(git rev-parse --verify HEAD) &&
|
2020-11-19 00:44:39 +01:00
|
|
|
M=$(git show-ref -s --verify refs/heads/main) &&
|
2007-03-29 10:02:50 +02:00
|
|
|
test "z$H" = "z$M" &&
|
|
|
|
if git symbolic-ref HEAD >/dev/null 2>&1
|
|
|
|
then
|
|
|
|
echo "OOPS, HEAD is still symbolic???"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
|
2011-04-13 01:39:14 +02:00
|
|
|
test_expect_success 'checkout to detach HEAD with branchname^' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -f main &&
|
2020-10-20 14:11:52 +02:00
|
|
|
git clean -f &&
|
2007-03-29 10:02:50 +02:00
|
|
|
git checkout renamer^ &&
|
|
|
|
H=$(git rev-parse --verify HEAD) &&
|
2020-11-19 00:44:39 +01:00
|
|
|
M=$(git show-ref -s --verify refs/heads/main) &&
|
2007-03-29 10:02:50 +02:00
|
|
|
test "z$H" = "z$M" &&
|
|
|
|
if git symbolic-ref HEAD >/dev/null 2>&1
|
|
|
|
then
|
|
|
|
echo "OOPS, HEAD is still symbolic???"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
|
2011-04-13 01:39:14 +02:00
|
|
|
test_expect_success 'checkout to detach HEAD with :/message' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -f main &&
|
2020-10-20 14:11:52 +02:00
|
|
|
git clean -f &&
|
2008-02-02 10:37:01 +01:00
|
|
|
git checkout ":/Initial" &&
|
|
|
|
H=$(git rev-parse --verify HEAD) &&
|
2020-11-19 00:44:39 +01:00
|
|
|
M=$(git show-ref -s --verify refs/heads/main) &&
|
2008-02-02 10:37:01 +01:00
|
|
|
test "z$H" = "z$M" &&
|
|
|
|
if git symbolic-ref HEAD >/dev/null 2>&1
|
|
|
|
then
|
|
|
|
echo "OOPS, HEAD is still symbolic???"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
|
2011-04-13 01:39:14 +02:00
|
|
|
test_expect_success 'checkout to detach HEAD with HEAD^0' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout -f main &&
|
2020-10-20 14:11:52 +02:00
|
|
|
git clean -f &&
|
2007-03-29 10:02:50 +02:00
|
|
|
git checkout HEAD^0 &&
|
|
|
|
H=$(git rev-parse --verify HEAD) &&
|
2020-11-19 00:44:39 +01:00
|
|
|
M=$(git show-ref -s --verify refs/heads/main) &&
|
2007-03-29 10:02:50 +02:00
|
|
|
test "z$H" = "z$M" &&
|
|
|
|
if git symbolic-ref HEAD >/dev/null 2>&1
|
|
|
|
then
|
|
|
|
echo "OOPS, HEAD is still symbolic???"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
|
2007-06-08 10:19:13 +02:00
|
|
|
test_expect_success 'checkout with ambiguous tag/branch names' '
|
|
|
|
git tag both side &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git branch both main &&
|
2007-06-08 10:19:13 +02:00
|
|
|
git reset --hard &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2007-06-08 10:19:13 +02:00
|
|
|
|
|
|
|
git checkout both &&
|
|
|
|
H=$(git rev-parse --verify HEAD) &&
|
2020-11-19 00:44:39 +01:00
|
|
|
M=$(git show-ref -s --verify refs/heads/main) &&
|
2007-06-08 10:19:13 +02:00
|
|
|
test "z$H" = "z$M" &&
|
|
|
|
name=$(git symbolic-ref HEAD 2>/dev/null) &&
|
|
|
|
test "z$name" = zrefs/heads/both
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'checkout with ambiguous tag/branch names' '
|
|
|
|
git reset --hard &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2007-06-08 10:19:13 +02:00
|
|
|
|
|
|
|
git tag frotz side &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git branch frotz main &&
|
2007-06-08 10:19:13 +02:00
|
|
|
git reset --hard &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2007-06-08 10:19:13 +02:00
|
|
|
|
|
|
|
git checkout tags/frotz &&
|
|
|
|
H=$(git rev-parse --verify HEAD) &&
|
|
|
|
S=$(git show-ref -s --verify refs/heads/side) &&
|
|
|
|
test "z$H" = "z$S" &&
|
|
|
|
if name=$(git symbolic-ref HEAD 2>/dev/null)
|
|
|
|
then
|
|
|
|
echo "Bad -- should have detached"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
|
2008-02-21 00:54:54 +01:00
|
|
|
test_expect_success 'switch branches while in subdirectory' '
|
|
|
|
git reset --hard &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2008-02-21 00:54:54 +01:00
|
|
|
|
|
|
|
mkdir subs &&
|
2020-10-20 13:43:18 +02:00
|
|
|
git -C subs checkout side &&
|
2008-02-21 00:54:54 +01:00
|
|
|
! test -f subs/one &&
|
|
|
|
rm -fr subs
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'checkout specific path while in subdirectory' '
|
|
|
|
git reset --hard &&
|
|
|
|
git checkout side &&
|
|
|
|
mkdir subs &&
|
|
|
|
>subs/bero &&
|
|
|
|
git add subs/bero &&
|
|
|
|
git commit -m "add subs/bero" &&
|
|
|
|
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2008-02-21 00:54:54 +01:00
|
|
|
mkdir -p subs &&
|
2020-10-20 13:43:18 +02:00
|
|
|
git -C subs checkout side -- bero &&
|
2008-02-21 00:54:54 +01:00
|
|
|
test -f subs/bero
|
|
|
|
'
|
|
|
|
|
2020-10-20 13:43:15 +02:00
|
|
|
test_expect_success 'checkout w/--track sets up tracking' '
|
2008-02-19 17:24:37 +01:00
|
|
|
git config branch.autosetupmerge false &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2008-02-19 17:24:37 +01:00
|
|
|
git checkout --track -b track1 &&
|
|
|
|
test "$(git config branch.track1.remote)" &&
|
2020-10-20 13:43:15 +02:00
|
|
|
test "$(git config branch.track1.merge)"
|
|
|
|
'
|
2008-02-19 17:24:37 +01:00
|
|
|
|
2020-10-20 13:43:15 +02:00
|
|
|
test_expect_success 'checkout w/autosetupmerge=always sets up tracking' '
|
2015-03-20 11:12:55 +01:00
|
|
|
test_when_finished git config branch.autosetupmerge false &&
|
2008-02-19 17:24:37 +01:00
|
|
|
git config branch.autosetupmerge always &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2008-02-19 17:24:37 +01:00
|
|
|
git checkout -b track2 &&
|
|
|
|
test "$(git config branch.track2.remote)" &&
|
2020-10-20 13:43:15 +02:00
|
|
|
test "$(git config branch.track2.merge)"
|
|
|
|
'
|
2008-02-19 17:24:37 +01:00
|
|
|
|
2008-10-17 08:37:44 +02:00
|
|
|
test_expect_success 'checkout w/--track from non-branch HEAD fails' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main^0 &&
|
2008-10-17 08:37:44 +02:00
|
|
|
test_must_fail git symbolic-ref HEAD &&
|
|
|
|
test_must_fail git checkout --track -b track &&
|
|
|
|
test_must_fail git rev-parse --verify track &&
|
|
|
|
test_must_fail git symbolic-ref HEAD &&
|
2020-11-19 00:44:39 +01:00
|
|
|
test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
|
2008-10-17 08:37:44 +02:00
|
|
|
'
|
2008-02-19 17:24:37 +01:00
|
|
|
|
2011-02-17 00:12:20 +01:00
|
|
|
test_expect_success 'checkout w/--track from tag fails' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main^0 &&
|
2011-02-17 00:12:20 +01:00
|
|
|
test_must_fail git symbolic-ref HEAD &&
|
|
|
|
test_must_fail git checkout --track -b track frotz &&
|
|
|
|
test_must_fail git rev-parse --verify track &&
|
|
|
|
test_must_fail git symbolic-ref HEAD &&
|
2020-11-19 00:44:39 +01:00
|
|
|
test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
|
2011-02-17 00:12:20 +01:00
|
|
|
'
|
|
|
|
|
2008-10-18 00:44:39 +02:00
|
|
|
test_expect_success 'detach a symbolic link HEAD' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2008-10-18 00:56:11 +02:00
|
|
|
git config --bool core.prefersymlinkrefs yes &&
|
|
|
|
git checkout side &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2008-10-18 00:56:11 +02:00
|
|
|
it=$(git symbolic-ref HEAD) &&
|
2020-11-19 00:44:39 +01:00
|
|
|
test "z$it" = zrefs/heads/main &&
|
|
|
|
here=$(git rev-parse --verify refs/heads/main) &&
|
2008-10-18 00:56:11 +02:00
|
|
|
git checkout side^ &&
|
2020-11-19 00:44:39 +01:00
|
|
|
test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
|
2008-10-18 00:56:11 +02:00
|
|
|
'
|
2008-02-19 17:24:37 +01:00
|
|
|
|
2020-10-20 13:43:15 +02:00
|
|
|
test_expect_success 'checkout with --track fakes a sensible -b <name>' '
|
2013-04-21 23:52:03 +02:00
|
|
|
git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
|
2008-08-09 16:00:12 +02:00
|
|
|
git update-ref refs/remotes/origin/koala/bear renamer &&
|
2008-08-21 19:23:20 +02:00
|
|
|
|
2008-08-09 16:00:12 +02:00
|
|
|
git checkout --track origin/koala/bear &&
|
|
|
|
test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
|
2008-08-21 19:23:20 +02:00
|
|
|
test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
|
|
|
|
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main && git branch -D koala/bear &&
|
2008-08-21 19:23:20 +02:00
|
|
|
|
|
|
|
git checkout --track refs/remotes/origin/koala/bear &&
|
|
|
|
test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
|
|
|
|
test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
|
|
|
|
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main && git branch -D koala/bear &&
|
2008-08-21 19:23:20 +02:00
|
|
|
|
|
|
|
git checkout --track remotes/origin/koala/bear &&
|
|
|
|
test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
|
|
|
|
test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
|
|
|
|
'
|
2008-08-09 16:00:12 +02:00
|
|
|
|
2020-10-20 13:43:15 +02:00
|
|
|
test_expect_success 'checkout with --track, but without -b, fails with too short tracked name' '
|
|
|
|
test_must_fail git checkout --track renamer
|
|
|
|
'
|
2008-08-09 16:00:12 +02:00
|
|
|
|
2008-09-01 04:32:40 +02:00
|
|
|
setup_conflicting_index () {
|
2008-08-29 22:40:36 +02:00
|
|
|
rm -f .git/index &&
|
|
|
|
O=$(echo original | git hash-object -w --stdin) &&
|
|
|
|
A=$(echo ourside | git hash-object -w --stdin) &&
|
|
|
|
B=$(echo theirside | git hash-object -w --stdin) &&
|
|
|
|
(
|
|
|
|
echo "100644 $A 0 fild" &&
|
|
|
|
echo "100644 $O 1 file" &&
|
|
|
|
echo "100644 $A 2 file" &&
|
|
|
|
echo "100644 $B 3 file" &&
|
|
|
|
echo "100644 $A 0 filf"
|
2008-09-01 04:32:40 +02:00
|
|
|
) | git update-index --index-info
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'checkout an unmerged path should fail' '
|
|
|
|
setup_conflicting_index &&
|
2008-08-29 22:40:36 +02:00
|
|
|
echo "none of the above" >sample &&
|
|
|
|
cat sample >fild &&
|
|
|
|
cat sample >file &&
|
|
|
|
cat sample >filf &&
|
|
|
|
test_must_fail git checkout fild file filf &&
|
|
|
|
test_cmp sample fild &&
|
|
|
|
test_cmp sample filf &&
|
|
|
|
test_cmp sample file
|
|
|
|
'
|
|
|
|
|
2008-08-30 16:46:55 +02:00
|
|
|
test_expect_success 'checkout with an unmerged path can be ignored' '
|
2008-09-01 04:32:40 +02:00
|
|
|
setup_conflicting_index &&
|
2008-08-30 16:46:55 +02:00
|
|
|
echo "none of the above" >sample &&
|
|
|
|
echo ourside >expect &&
|
|
|
|
cat sample >fild &&
|
|
|
|
cat sample >file &&
|
|
|
|
cat sample >filf &&
|
|
|
|
git checkout -f fild file filf &&
|
|
|
|
test_cmp expect fild &&
|
|
|
|
test_cmp expect filf &&
|
|
|
|
test_cmp sample file
|
|
|
|
'
|
|
|
|
|
2008-08-30 16:48:18 +02:00
|
|
|
test_expect_success 'checkout unmerged stage' '
|
2008-09-01 04:32:40 +02:00
|
|
|
setup_conflicting_index &&
|
2008-08-30 16:48:18 +02:00
|
|
|
echo "none of the above" >sample &&
|
|
|
|
echo ourside >expect &&
|
|
|
|
cat sample >fild &&
|
|
|
|
cat sample >file &&
|
|
|
|
cat sample >filf &&
|
|
|
|
git checkout --ours . &&
|
|
|
|
test_cmp expect fild &&
|
|
|
|
test_cmp expect filf &&
|
|
|
|
test_cmp expect file &&
|
|
|
|
git checkout --theirs file &&
|
|
|
|
test ztheirside = "z$(cat file)"
|
|
|
|
'
|
|
|
|
|
2008-08-30 16:52:24 +02:00
|
|
|
test_expect_success 'checkout with --merge' '
|
2008-09-01 04:32:40 +02:00
|
|
|
setup_conflicting_index &&
|
2008-08-30 16:52:24 +02:00
|
|
|
echo "none of the above" >sample &&
|
|
|
|
echo ourside >expect &&
|
|
|
|
cat sample >fild &&
|
|
|
|
cat sample >file &&
|
|
|
|
cat sample >filf &&
|
|
|
|
git checkout -m -- fild file filf &&
|
|
|
|
(
|
2018-07-02 02:24:03 +02:00
|
|
|
echo "<<<<<<< ours" &&
|
|
|
|
echo ourside &&
|
|
|
|
echo "=======" &&
|
|
|
|
echo theirside &&
|
2008-08-30 16:52:24 +02:00
|
|
|
echo ">>>>>>> theirs"
|
|
|
|
) >merged &&
|
|
|
|
test_cmp expect fild &&
|
|
|
|
test_cmp expect filf &&
|
|
|
|
test_cmp merged file
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'checkout with --merge, in diff3 -m style' '
|
|
|
|
git config merge.conflictstyle diff3 &&
|
2008-09-01 04:32:40 +02:00
|
|
|
setup_conflicting_index &&
|
2008-08-30 16:52:24 +02:00
|
|
|
echo "none of the above" >sample &&
|
|
|
|
echo ourside >expect &&
|
|
|
|
cat sample >fild &&
|
|
|
|
cat sample >file &&
|
|
|
|
cat sample >filf &&
|
|
|
|
git checkout -m -- fild file filf &&
|
|
|
|
(
|
2018-07-02 02:24:03 +02:00
|
|
|
echo "<<<<<<< ours" &&
|
|
|
|
echo ourside &&
|
|
|
|
echo "||||||| base" &&
|
|
|
|
echo original &&
|
|
|
|
echo "=======" &&
|
|
|
|
echo theirside &&
|
2008-08-30 16:52:24 +02:00
|
|
|
echo ">>>>>>> theirs"
|
|
|
|
) >merged &&
|
|
|
|
test_cmp expect fild &&
|
|
|
|
test_cmp expect filf &&
|
|
|
|
test_cmp merged file
|
|
|
|
'
|
|
|
|
|
2008-09-01 04:32:40 +02:00
|
|
|
test_expect_success 'checkout --conflict=merge, overriding config' '
|
|
|
|
git config merge.conflictstyle diff3 &&
|
|
|
|
setup_conflicting_index &&
|
|
|
|
echo "none of the above" >sample &&
|
|
|
|
echo ourside >expect &&
|
|
|
|
cat sample >fild &&
|
|
|
|
cat sample >file &&
|
|
|
|
cat sample >filf &&
|
|
|
|
git checkout --conflict=merge -- fild file filf &&
|
|
|
|
(
|
2018-07-02 02:24:03 +02:00
|
|
|
echo "<<<<<<< ours" &&
|
|
|
|
echo ourside &&
|
|
|
|
echo "=======" &&
|
|
|
|
echo theirside &&
|
2008-09-01 04:32:40 +02:00
|
|
|
echo ">>>>>>> theirs"
|
|
|
|
) >merged &&
|
|
|
|
test_cmp expect fild &&
|
|
|
|
test_cmp expect filf &&
|
|
|
|
test_cmp merged file
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'checkout --conflict=diff3' '
|
2015-03-20 11:10:21 +01:00
|
|
|
test_unconfig merge.conflictstyle &&
|
2008-09-01 04:32:40 +02:00
|
|
|
setup_conflicting_index &&
|
|
|
|
echo "none of the above" >sample &&
|
|
|
|
echo ourside >expect &&
|
|
|
|
cat sample >fild &&
|
|
|
|
cat sample >file &&
|
|
|
|
cat sample >filf &&
|
|
|
|
git checkout --conflict=diff3 -- fild file filf &&
|
|
|
|
(
|
2018-07-02 02:24:03 +02:00
|
|
|
echo "<<<<<<< ours" &&
|
|
|
|
echo ourside &&
|
|
|
|
echo "||||||| base" &&
|
|
|
|
echo original &&
|
|
|
|
echo "=======" &&
|
|
|
|
echo theirside &&
|
2008-09-01 04:32:40 +02:00
|
|
|
echo ">>>>>>> theirs"
|
|
|
|
) >merged &&
|
|
|
|
test_cmp expect fild &&
|
|
|
|
test_cmp expect filf &&
|
|
|
|
test_cmp merged file
|
|
|
|
'
|
|
|
|
|
2008-09-21 20:36:06 +02:00
|
|
|
test_expect_success 'failing checkout -b should not break working tree' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git reset --hard main &&
|
|
|
|
git symbolic-ref HEAD refs/heads/main &&
|
2008-09-21 20:36:06 +02:00
|
|
|
test_must_fail git checkout -b renamer side^ &&
|
2020-11-19 00:44:39 +01:00
|
|
|
test $(git symbolic-ref HEAD) = refs/heads/main &&
|
2008-09-21 20:36:06 +02:00
|
|
|
git diff --exit-code &&
|
|
|
|
git diff --cached --exit-code
|
|
|
|
'
|
|
|
|
|
2009-05-17 04:43:08 +02:00
|
|
|
test_expect_success 'switch out of non-branch' '
|
2020-11-19 00:44:39 +01:00
|
|
|
git reset --hard main &&
|
|
|
|
git checkout main^0 &&
|
2009-05-17 04:43:08 +02:00
|
|
|
echo modified >one &&
|
|
|
|
test_must_fail git checkout renamer 2>error.log &&
|
|
|
|
! grep "^Previous HEAD" error.log
|
|
|
|
'
|
|
|
|
|
2010-01-06 21:32:02 +01:00
|
|
|
(
|
|
|
|
echo "#!$SHELL_PATH"
|
|
|
|
cat <<\EOF
|
|
|
|
O=$1 A=$2 B=$3
|
|
|
|
cat "$A" >.tmp
|
|
|
|
exec >"$A"
|
|
|
|
echo '<<<<<<< filfre-theirs'
|
|
|
|
cat "$B"
|
|
|
|
echo '||||||| filfre-common'
|
|
|
|
cat "$O"
|
|
|
|
echo '======='
|
|
|
|
cat ".tmp"
|
|
|
|
echo '>>>>>>> filfre-ours'
|
|
|
|
rm -f .tmp
|
|
|
|
exit 1
|
|
|
|
EOF
|
|
|
|
) >filfre.sh
|
|
|
|
chmod +x filfre.sh
|
|
|
|
|
|
|
|
test_expect_success 'custom merge driver with checkout -m' '
|
|
|
|
git reset --hard &&
|
|
|
|
|
|
|
|
git config merge.filfre.driver "./filfre.sh %O %A %B" &&
|
|
|
|
git config merge.filfre.name "Feel-free merge driver" &&
|
|
|
|
git config merge.filfre.recursive binary &&
|
|
|
|
echo "arm merge=filfre" >.gitattributes &&
|
|
|
|
|
|
|
|
git checkout -b left &&
|
|
|
|
echo neutral >arm &&
|
|
|
|
git add arm .gitattributes &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m neutral &&
|
|
|
|
git branch right &&
|
|
|
|
|
|
|
|
echo left >arm &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m left &&
|
|
|
|
git checkout right &&
|
|
|
|
|
|
|
|
echo right >arm &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m right &&
|
|
|
|
|
|
|
|
test_must_fail git merge left &&
|
|
|
|
(
|
|
|
|
for t in filfre-common left right
|
|
|
|
do
|
|
|
|
grep $t arm || exit 1
|
|
|
|
done
|
|
|
|
) &&
|
|
|
|
|
|
|
|
mv arm expect &&
|
|
|
|
git checkout -m arm &&
|
|
|
|
test_cmp expect arm
|
|
|
|
'
|
|
|
|
|
2006-06-28 20:47:28 +02:00
|
|
|
test_done
|