2005-08-10 03:07:36 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Johannes Schindelin
|
|
|
|
#
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
test_description='Test git rev-parse with different parent options'
|
2005-08-10 03:07:36 +00:00
|
|
|
|
2020-11-18 23:44:36 +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
|
|
|
|
|
2022-04-13 20:01:48 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2005-08-10 03:07:36 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2013-09-03 17:07:15 +00:00
|
|
|
test_cmp_rev_output () {
|
|
|
|
git rev-parse --verify "$1" >expect &&
|
|
|
|
eval "$2" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
}
|
|
|
|
|
2013-09-03 17:15:46 +00:00
|
|
|
test_expect_success 'setup' '
|
|
|
|
test_commit start &&
|
|
|
|
test_commit second &&
|
|
|
|
git checkout --orphan tmp &&
|
|
|
|
test_commit start2 &&
|
2020-11-18 23:44:36 +00:00
|
|
|
git checkout main &&
|
merge: refuse to create too cool a merge by default
While it makes sense to allow merging unrelated histories of two
projects that started independently into one, in the way "gitk" was
merged to "git" itself aka "the coolest merge ever", such a merge is
still an unusual event. Worse, if somebody creates an independent
history by starting from a tarball of an established project and
sends a pull request to the original project, "git merge" however
happily creates such a merge without any sign of something unusual
is happening.
Teach "git merge" to refuse to create such a merge by default,
unless the user passes a new "--allow-unrelated-histories" option to
tell it that the user is aware that two unrelated projects are
merged.
Because such a "two project merge" is a rare event, a configuration
option to always allow such a merge is not added.
We could add the same option to "git pull" and have it passed
through to underlying "git merge". I do not have a fundamental
opposition against such a feature, but this commit does not do so
and instead leaves it as low-hanging fruit for others, because such
a "two project merge" would be done after fetching the other project
into some location in the working tree of an existing project and
making sure how well they fit together, it is sufficient to allow a
local merge without such an option pass-through from "git pull" to
"git merge". Many tests that are updated by this patch does the
pass-through manually by turning:
git pull something
into its equivalent:
git fetch something &&
git merge --allow-unrelated-histories FETCH_HEAD
If somebody is inclined to add such an option, updated tests in this
change need to be adjusted back to:
git pull --allow-unrelated-histories something
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-18 20:21:09 +00:00
|
|
|
git merge -m next --allow-unrelated-histories start2 &&
|
2013-12-27 20:49:57 +00:00
|
|
|
test_commit final &&
|
|
|
|
|
|
|
|
test_seq 40 |
|
|
|
|
while read i
|
|
|
|
do
|
|
|
|
git checkout --orphan "b$i" &&
|
|
|
|
test_tick &&
|
|
|
|
git commit --allow-empty -m "$i" &&
|
|
|
|
commit=$(git rev-parse --verify HEAD) &&
|
2021-12-09 05:11:15 +00:00
|
|
|
printf "$commit " >>.git/info/grafts || return 1
|
2013-12-27 20:49:57 +00:00
|
|
|
done
|
2013-09-03 17:15:46 +00:00
|
|
|
'
|
2005-08-10 03:07:36 +00:00
|
|
|
|
2013-09-03 17:05:32 +00:00
|
|
|
test_expect_success 'start is valid' '
|
2020-07-29 23:13:55 +00:00
|
|
|
git rev-parse start | grep "^$OID_REGEX$"
|
2013-09-03 17:05:32 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'start^0' '
|
2013-09-03 17:07:15 +00:00
|
|
|
test_cmp_rev_output tags/start "git rev-parse start^0"
|
2013-09-03 17:05:32 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'start^1 not valid' '
|
2013-09-03 17:06:18 +00:00
|
|
|
test_must_fail git rev-parse --verify start^1
|
2013-09-03 17:05:32 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'second^1 = second^' '
|
2013-09-03 17:07:15 +00:00
|
|
|
test_cmp_rev_output second^ "git rev-parse second^1"
|
2013-09-03 17:05:32 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'final^1^1^1' '
|
2013-09-03 17:07:15 +00:00
|
|
|
test_cmp_rev_output start "git rev-parse final^1^1^1"
|
2013-09-03 17:05:32 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'final^1^1^1 = final^^^' '
|
2013-09-03 17:07:15 +00:00
|
|
|
test_cmp_rev_output final^^^ "git rev-parse final^1^1^1"
|
2013-09-03 17:05:32 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'final^1^2' '
|
2013-09-03 17:07:15 +00:00
|
|
|
test_cmp_rev_output start2 "git rev-parse final^1^2"
|
2013-09-03 17:05:32 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'final^1^2 != final^1^1' '
|
|
|
|
test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'final^1^3 not valid' '
|
2013-09-03 17:06:18 +00:00
|
|
|
test_must_fail git rev-parse --verify final^1^3
|
2013-09-03 17:05:32 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--verify start2^1' '
|
|
|
|
test_must_fail git rev-parse --verify start2^1
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--verify start2^0' '
|
|
|
|
git rev-parse --verify start2^0
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'final^1^@ = final^1^1 final^1^2' '
|
2013-09-03 17:07:15 +00:00
|
|
|
git rev-parse final^1^1 final^1^2 >expect &&
|
|
|
|
git rev-parse final^1^@ >actual &&
|
|
|
|
test_cmp expect actual
|
2013-09-03 17:05:32 +00:00
|
|
|
'
|
|
|
|
|
2016-11-16 08:46:26 +00:00
|
|
|
test_expect_success 'symbolic final^1^@ = final^1^1 final^1^2' '
|
|
|
|
git rev-parse --symbolic final^1^1 final^1^2 >expect &&
|
|
|
|
git rev-parse --symbolic final^1^@ >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2013-09-03 17:05:32 +00:00
|
|
|
test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' '
|
2013-09-03 17:07:15 +00:00
|
|
|
git rev-parse final^1 ^final^1^1 ^final^1^2 >expect &&
|
|
|
|
git rev-parse final^1^! >actual &&
|
|
|
|
test_cmp expect actual
|
2013-09-03 17:05:32 +00:00
|
|
|
'
|
|
|
|
|
2016-11-16 08:46:26 +00:00
|
|
|
test_expect_success 'symbolic final^1^! = final^1 ^final^1^1 ^final^1^2' '
|
|
|
|
git rev-parse --symbolic final^1 ^final^1^1 ^final^1^2 >expect &&
|
|
|
|
git rev-parse --symbolic final^1^! >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2013-12-27 20:49:57 +00:00
|
|
|
test_expect_success 'large graft octopus' '
|
|
|
|
test_cmp_rev_output b31 "git rev-parse --verify b1^30"
|
|
|
|
'
|
|
|
|
|
2013-09-03 17:05:32 +00:00
|
|
|
test_expect_success 'repack for next test' '
|
|
|
|
git repack -a -d
|
|
|
|
'
|
|
|
|
|
2007-05-30 04:50:26 +00:00
|
|
|
test_expect_success 'short SHA-1 works' '
|
2013-09-03 17:07:15 +00:00
|
|
|
start=$(git rev-parse --verify start) &&
|
|
|
|
test_cmp_rev_output start "git rev-parse ${start%?}"
|
2013-09-03 17:05:32 +00:00
|
|
|
'
|
2007-05-30 04:50:26 +00:00
|
|
|
|
2016-09-27 08:32:49 +00:00
|
|
|
# rev^- tests; we can use a simpler setup for these
|
|
|
|
|
|
|
|
test_expect_success 'setup for rev^- tests' '
|
|
|
|
test_commit one &&
|
|
|
|
test_commit two &&
|
|
|
|
test_commit three &&
|
|
|
|
|
|
|
|
# Merge in a branch for testing rev^-
|
|
|
|
git checkout -b branch &&
|
|
|
|
git checkout HEAD^^ &&
|
|
|
|
git merge -m merge --no-edit --no-ff branch &&
|
|
|
|
git checkout -b merge
|
|
|
|
'
|
|
|
|
|
|
|
|
# The merged branch has 2 commits + the merge
|
|
|
|
test_expect_success 'rev-list --count merge^- = merge^..merge' '
|
|
|
|
git rev-list --count merge^..merge >expect &&
|
|
|
|
echo 3 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
# All rev^- rev-parse tests
|
|
|
|
|
|
|
|
test_expect_success 'rev-parse merge^- = merge^..merge' '
|
|
|
|
git rev-parse merge^..merge >expect &&
|
|
|
|
git rev-parse merge^- >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-parse merge^-1 = merge^..merge' '
|
|
|
|
git rev-parse merge^1..merge >expect &&
|
|
|
|
git rev-parse merge^-1 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-parse merge^-2 = merge^2..merge' '
|
|
|
|
git rev-parse merge^2..merge >expect &&
|
|
|
|
git rev-parse merge^-2 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2016-11-16 08:46:26 +00:00
|
|
|
test_expect_success 'symbolic merge^-1 = merge^1..merge' '
|
|
|
|
git rev-parse --symbolic merge^1..merge >expect &&
|
|
|
|
git rev-parse --symbolic merge^-1 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2016-09-27 08:32:49 +00:00
|
|
|
test_expect_success 'rev-parse merge^-0 (invalid parent)' '
|
|
|
|
test_must_fail git rev-parse merge^-0
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-parse merge^-3 (invalid parent)' '
|
|
|
|
test_must_fail git rev-parse merge^-3
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-parse merge^-^ (garbage after ^-)' '
|
|
|
|
test_must_fail git rev-parse merge^-^
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-parse merge^-1x (garbage after ^-1)' '
|
|
|
|
test_must_fail git rev-parse merge^-1x
|
|
|
|
'
|
|
|
|
|
|
|
|
# All rev^- rev-list tests (should be mostly the same as rev-parse; the reason
|
|
|
|
# for the duplication is that rev-parse and rev-list use different parsers).
|
|
|
|
|
|
|
|
test_expect_success 'rev-list merge^- = merge^..merge' '
|
|
|
|
git rev-list merge^..merge >expect &&
|
|
|
|
git rev-list merge^- >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-list merge^-1 = merge^1..merge' '
|
|
|
|
git rev-list merge^1..merge >expect &&
|
|
|
|
git rev-list merge^-1 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-list merge^-2 = merge^2..merge' '
|
|
|
|
git rev-list merge^2..merge >expect &&
|
|
|
|
git rev-list merge^-2 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-list merge^-0 (invalid parent)' '
|
|
|
|
test_must_fail git rev-list merge^-0
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-list merge^-3 (invalid parent)' '
|
|
|
|
test_must_fail git rev-list merge^-3
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-list merge^-^ (garbage after ^-)' '
|
|
|
|
test_must_fail git rev-list merge^-^
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-list merge^-1x (garbage after ^-1)' '
|
|
|
|
test_must_fail git rev-list merge^-1x
|
|
|
|
'
|
|
|
|
|
2018-05-24 06:27:33 +00:00
|
|
|
test_expect_success 'rev-parse $garbage^@ does not segfault' '
|
|
|
|
test_must_fail git rev-parse $EMPTY_TREE^@
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-parse $garbage...$garbage does not segfault' '
|
|
|
|
test_must_fail git rev-parse $EMPTY_TREE...$EMPTY_BLOB
|
|
|
|
'
|
|
|
|
|
2005-08-10 03:07:36 +00:00
|
|
|
test_done
|