2015-10-26 21:37:18 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='merge: handle file mode'
|
2020-11-18 23:44:38 +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
|
2015-10-26 21:37:18 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'set up mode change in one branch' '
|
|
|
|
: >file1 &&
|
|
|
|
git add file1 &&
|
|
|
|
git commit -m initial &&
|
2020-11-18 23:44:38 +00:00
|
|
|
git checkout -b a1 main &&
|
2015-10-26 21:37:18 +00:00
|
|
|
: >dummy &&
|
|
|
|
git add dummy &&
|
|
|
|
git commit -m a &&
|
2020-11-18 23:44:38 +00:00
|
|
|
git checkout -b b1 main &&
|
2015-10-26 21:37:18 +00:00
|
|
|
test_chmod +x file1 &&
|
|
|
|
git add file1 &&
|
|
|
|
git commit -m b1
|
|
|
|
'
|
|
|
|
|
|
|
|
do_one_mode () {
|
|
|
|
strategy=$1
|
|
|
|
us=$2
|
|
|
|
them=$3
|
|
|
|
test_expect_success "resolve single mode change ($strategy, $us)" '
|
|
|
|
git checkout -f $us &&
|
|
|
|
git merge -s $strategy $them &&
|
|
|
|
git ls-files -s file1 | grep ^100755
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success FILEMODE "verify executable bit on file ($strategy, $us)" '
|
|
|
|
test -x file1
|
|
|
|
'
|
|
|
|
}
|
|
|
|
|
|
|
|
do_one_mode recursive a1 b1
|
|
|
|
do_one_mode recursive b1 a1
|
|
|
|
do_one_mode resolve a1 b1
|
|
|
|
do_one_mode resolve b1 a1
|
|
|
|
|
|
|
|
test_expect_success 'set up mode change in both branches' '
|
|
|
|
git reset --hard HEAD &&
|
2020-11-18 23:44:38 +00:00
|
|
|
git checkout -b a2 main &&
|
2015-10-26 21:37:18 +00:00
|
|
|
: >file2 &&
|
|
|
|
H=$(git hash-object file2) &&
|
|
|
|
test_chmod +x file2 &&
|
|
|
|
git commit -m a2 &&
|
2020-11-18 23:44:38 +00:00
|
|
|
git checkout -b b2 main &&
|
2015-10-26 21:37:18 +00:00
|
|
|
: >file2 &&
|
|
|
|
git add file2 &&
|
|
|
|
git commit -m b2 &&
|
2021-12-09 05:11:04 +00:00
|
|
|
cat >expect <<-EOF
|
|
|
|
100755 $H 2 file2
|
|
|
|
100644 $H 3 file2
|
|
|
|
EOF
|
2015-10-26 21:37:18 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
do_both_modes () {
|
|
|
|
strategy=$1
|
|
|
|
test_expect_success "detect conflict on double mode change ($strategy)" '
|
|
|
|
git reset --hard &&
|
|
|
|
git checkout -f a2 &&
|
|
|
|
test_must_fail git merge -s $strategy b2 &&
|
|
|
|
git ls-files -u >actual &&
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expect actual &&
|
2015-10-26 21:37:18 +00:00
|
|
|
git ls-files -s file2 | grep ^100755
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success FILEMODE "verify executable bit on file ($strategy)" '
|
|
|
|
test -x file2
|
|
|
|
'
|
|
|
|
}
|
|
|
|
|
|
|
|
# both sides are equivalent, so no need to run both ways
|
|
|
|
do_both_modes recursive
|
|
|
|
do_both_modes resolve
|
|
|
|
|
2015-10-26 21:39:39 +00:00
|
|
|
test_expect_success 'set up delete/modechange scenario' '
|
|
|
|
git reset --hard &&
|
2020-11-18 23:44:38 +00:00
|
|
|
git checkout -b deletion main &&
|
2015-10-26 21:39:39 +00:00
|
|
|
git rm file1 &&
|
|
|
|
git commit -m deletion
|
|
|
|
'
|
|
|
|
|
|
|
|
do_delete_modechange () {
|
|
|
|
strategy=$1
|
|
|
|
us=$2
|
|
|
|
them=$3
|
|
|
|
test_expect_success "detect delete/modechange conflict ($strategy, $us)" '
|
|
|
|
git reset --hard &&
|
|
|
|
git checkout $us &&
|
|
|
|
test_must_fail git merge -s $strategy $them
|
|
|
|
'
|
|
|
|
}
|
|
|
|
|
|
|
|
do_delete_modechange recursive b1 deletion
|
|
|
|
do_delete_modechange recursive deletion b1
|
|
|
|
do_delete_modechange resolve b1 deletion
|
|
|
|
do_delete_modechange resolve deletion b1
|
|
|
|
|
2015-10-26 21:37:18 +00:00
|
|
|
test_done
|