2017-04-24 10:01:23 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='test worktree ref store api'
|
|
|
|
|
2020-11-18 23:44:21 +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
|
|
|
|
|
leak tests: mark passing SANITIZE=leak tests as leak-free
Mark those remaining tests that pass when run under SANITIZE=leak with
TEST_PASSES_SANITIZE_LEAK=true, these were either omitted in
f346fcb62a0 (Merge branch 'ab/mark-leak-free-tests-even-more',
2021-12-15) and 5a4f8381b68 (Merge branch 'ab/mark-leak-free-tests',
2021-10-25), or have had their memory leaks fixed since then.
With this change there's now a a one-to-one mapping between those
tests that we have opted-in via "TEST_PASSES_SANITIZE_LEAK=true", and
those that pass with the new "check" mode:
GIT_TEST_PASSING_SANITIZE_LEAK=check \
GIT_TEST_SANITIZE_LEAK_LOG=true \
make test SANITIZE=leak
Note that the "GIT_TEST_SANITIZE_LEAK_LOG=true" is needed due to the
edge cases noted in a preceding commit, i.e. in some cases we'd pass
the test itself, but still have outstanding leaks due to ignored exit
codes.
The "GIT_TEST_SANITIZE_LEAK_LOG=true" corrects for that, we're only
marking those tests as passing that really don't have any leaks,
whether that was reflected in their exit code or not.
Note that the change here to "t9100-git-svn-basic.sh" is marking that
test as passing under SANITIZE=leak, we're removing a
"TEST_FAILS_SANITIZE_LEAK=true" line, not
"TEST_PASSES_SANITIZE_LEAK=true". See 7a98d9ab00d (revisions API: have
release_revisions() release "cmdline", 2022-04-13) for the
introduction of that t/lib-git-svn.sh-specific variable.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-27 23:13:41 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2017-04-24 10:01:23 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2018-03-24 07:44:52 +00:00
|
|
|
RWT="test-tool ref-store worktree:wt"
|
|
|
|
RMAIN="test-tool ref-store worktree:main"
|
2017-04-24 10:01:23 +00:00
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
test_commit first &&
|
2020-11-18 23:44:21 +00:00
|
|
|
git worktree add -b wt-main wt &&
|
2017-04-24 10:01:23 +00:00
|
|
|
(
|
|
|
|
cd wt &&
|
|
|
|
test_commit second
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'resolve_ref(<shared-ref>)' '
|
2020-11-18 23:44:21 +00:00
|
|
|
SHA1=`git rev-parse main` &&
|
|
|
|
echo "$SHA1 refs/heads/main 0x0" >expected &&
|
|
|
|
$RWT resolve-ref refs/heads/main 0 >actual &&
|
2017-04-24 10:01:23 +00:00
|
|
|
test_cmp expected actual &&
|
2020-11-18 23:44:21 +00:00
|
|
|
$RMAIN resolve-ref refs/heads/main 0 >actual &&
|
2017-04-24 10:01:23 +00:00
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'resolve_ref(<per-worktree-ref>)' '
|
|
|
|
SHA1=`git -C wt rev-parse HEAD` &&
|
2020-11-18 23:44:21 +00:00
|
|
|
echo "$SHA1 refs/heads/wt-main 0x1" >expected &&
|
2017-04-24 10:01:23 +00:00
|
|
|
$RWT resolve-ref HEAD 0 >actual &&
|
|
|
|
test_cmp expected actual &&
|
|
|
|
|
|
|
|
SHA1=`git rev-parse HEAD` &&
|
2020-11-18 23:44:21 +00:00
|
|
|
echo "$SHA1 refs/heads/main 0x1" >expected &&
|
2017-04-24 10:01:23 +00:00
|
|
|
$RMAIN resolve-ref HEAD 0 >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2020-11-18 23:44:21 +00:00
|
|
|
test_expect_success 'create_symref(FOO, refs/heads/main)' '
|
|
|
|
$RWT create-symref FOO refs/heads/main nothing &&
|
|
|
|
echo refs/heads/main >expected &&
|
2017-04-24 10:01:24 +00:00
|
|
|
git -C wt symbolic-ref FOO >actual &&
|
|
|
|
test_cmp expected actual &&
|
|
|
|
|
2020-11-18 23:44:21 +00:00
|
|
|
$RMAIN create-symref FOO refs/heads/wt-main nothing &&
|
|
|
|
echo refs/heads/wt-main >expected &&
|
2017-04-24 10:01:24 +00:00
|
|
|
git symbolic-ref FOO >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2021-05-31 16:56:30 +00:00
|
|
|
# Some refs (refs/bisect/*, pseudorefs) are kept per worktree, so they should
|
|
|
|
# only appear in the for-each-reflog output if it is called from the correct
|
|
|
|
# worktree, which is exercised in this test. This test is poorly written (and
|
|
|
|
# therefore marked REFFILES) for mulitple reasons: 1) it creates invalidly
|
|
|
|
# formatted log entres. 2) it uses direct FS access for creating the reflogs. 3)
|
|
|
|
# PSEUDO-WT and refs/bisect/random do not create reflogs by default, so it is
|
|
|
|
# not testing a realistic scenario.
|
|
|
|
test_expect_success REFFILES 'for_each_reflog()' '
|
2018-05-13 02:24:13 +00:00
|
|
|
echo $ZERO_OID > .git/logs/PSEUDO-MAIN &&
|
2017-08-23 12:37:00 +00:00
|
|
|
mkdir -p .git/logs/refs/bisect &&
|
2018-05-13 02:24:13 +00:00
|
|
|
echo $ZERO_OID > .git/logs/refs/bisect/random &&
|
2017-08-23 12:37:00 +00:00
|
|
|
|
2018-05-13 02:24:13 +00:00
|
|
|
echo $ZERO_OID > .git/worktrees/wt/logs/PSEUDO-WT &&
|
2017-08-23 12:37:00 +00:00
|
|
|
mkdir -p .git/worktrees/wt/logs/refs/bisect &&
|
2018-05-13 02:24:13 +00:00
|
|
|
echo $ZERO_OID > .git/worktrees/wt/logs/refs/bisect/wt-random &&
|
2017-08-23 12:37:00 +00:00
|
|
|
|
2018-09-13 05:17:41 +00:00
|
|
|
$RWT for-each-reflog | cut -d" " -f 2- | sort >actual &&
|
2017-08-23 12:37:00 +00:00
|
|
|
cat >expected <<-\EOF &&
|
|
|
|
HEAD 0x1
|
|
|
|
PSEUDO-WT 0x0
|
|
|
|
refs/bisect/wt-random 0x0
|
2020-11-18 23:44:21 +00:00
|
|
|
refs/heads/main 0x0
|
|
|
|
refs/heads/wt-main 0x0
|
2017-08-23 12:37:00 +00:00
|
|
|
EOF
|
|
|
|
test_cmp expected actual &&
|
|
|
|
|
2018-09-13 05:17:41 +00:00
|
|
|
$RMAIN for-each-reflog | cut -d" " -f 2- | sort >actual &&
|
2017-08-23 12:37:00 +00:00
|
|
|
cat >expected <<-\EOF &&
|
|
|
|
HEAD 0x1
|
|
|
|
PSEUDO-MAIN 0x0
|
|
|
|
refs/bisect/random 0x0
|
2020-11-18 23:44:21 +00:00
|
|
|
refs/heads/main 0x0
|
|
|
|
refs/heads/wt-main 0x0
|
2017-08-23 12:37:00 +00:00
|
|
|
EOF
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2017-04-24 10:01:23 +00:00
|
|
|
test_done
|