2008-04-30 19:23:55 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='merging with large rename matrix'
|
2020-11-19 00:44:38 +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
|
|
|
|
|
2008-04-30 19:23:55 +02:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
count() {
|
|
|
|
i=1
|
|
|
|
while test $i -le $1; do
|
|
|
|
echo $i
|
|
|
|
i=$(($i + 1))
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'setup (initial)' '
|
|
|
|
touch file &&
|
|
|
|
git add . &&
|
|
|
|
git commit -m initial &&
|
|
|
|
git tag initial
|
|
|
|
'
|
|
|
|
|
|
|
|
make_text() {
|
|
|
|
echo $1: $2
|
2016-01-07 14:51:45 +01:00
|
|
|
for i in $(count 20); do
|
2008-04-30 19:23:55 +02:00
|
|
|
echo $1: $i
|
|
|
|
done
|
|
|
|
echo $1: $3
|
|
|
|
}
|
|
|
|
|
|
|
|
test_rename() {
|
|
|
|
test_expect_success "rename ($1, $2)" '
|
2015-03-20 11:10:21 +01:00
|
|
|
n='$1' &&
|
|
|
|
expect='$2' &&
|
2020-11-19 00:44:38 +01:00
|
|
|
git checkout -f main &&
|
2015-03-20 11:10:21 +01:00
|
|
|
test_might_fail git branch -D test$n &&
|
2008-04-30 19:23:55 +02:00
|
|
|
git reset --hard initial &&
|
|
|
|
for i in $(count $n); do
|
|
|
|
make_text $i initial initial >$i
|
|
|
|
done &&
|
|
|
|
git add . &&
|
|
|
|
git commit -m add=$n &&
|
|
|
|
for i in $(count $n); do
|
|
|
|
make_text $i changed initial >$i
|
|
|
|
done &&
|
|
|
|
git commit -a -m change=$n &&
|
|
|
|
git checkout -b test$n HEAD^ &&
|
|
|
|
for i in $(count $n); do
|
tests: fix broken &&-chains in compound statements
The top-level &&-chain checker built into t/test-lib.sh causes tests to
magically exit with code 117 if the &&-chain is broken. However, it has
the shortcoming that the magic does not work within `{...}` groups,
`(...)` subshells, `$(...)` substitutions, or within bodies of compound
statements, such as `if`, `for`, `while`, `case`, etc. `chainlint.sed`
partly fills in the gap by catching broken &&-chains in `(...)`
subshells, but bugs can still lurk behind broken &&-chains in the other
cases.
Fix broken &&-chains in compound statements in order to reduce the
number of possible lurking bugs.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-12-09 06:11:06 +01:00
|
|
|
git rm $i &&
|
2008-04-30 19:23:55 +02:00
|
|
|
make_text $i initial changed >$i.moved
|
|
|
|
done &&
|
|
|
|
git add . &&
|
|
|
|
git commit -m change+rename=$n &&
|
|
|
|
case "$expect" in
|
2020-11-19 00:44:38 +01:00
|
|
|
ok) git merge main ;;
|
|
|
|
*) test_must_fail git merge main ;;
|
2008-04-30 19:23:55 +02:00
|
|
|
esac
|
|
|
|
'
|
|
|
|
}
|
|
|
|
|
|
|
|
test_rename 5 ok
|
|
|
|
|
|
|
|
test_expect_success 'set diff.renamelimit to 4' '
|
|
|
|
git config diff.renamelimit 4
|
|
|
|
'
|
|
|
|
test_rename 4 ok
|
|
|
|
test_rename 5 fail
|
|
|
|
|
|
|
|
test_expect_success 'set merge.renamelimit to 5' '
|
|
|
|
git config merge.renamelimit 5
|
|
|
|
'
|
|
|
|
test_rename 5 ok
|
|
|
|
test_rename 6 fail
|
|
|
|
|
2010-09-20 10:28:36 +02:00
|
|
|
test_expect_success 'setup large simple rename' '
|
|
|
|
git config --unset merge.renamelimit &&
|
|
|
|
git config --unset diff.renamelimit &&
|
|
|
|
|
|
|
|
git reset --hard initial &&
|
|
|
|
for i in $(count 200); do
|
|
|
|
make_text foo bar baz >$i
|
|
|
|
done &&
|
|
|
|
git add . &&
|
|
|
|
git commit -m create-files &&
|
|
|
|
|
|
|
|
git branch simple-change &&
|
|
|
|
git checkout -b simple-rename &&
|
|
|
|
|
|
|
|
mkdir builtin &&
|
|
|
|
git mv [0-9]* builtin/ &&
|
|
|
|
git commit -m renamed &&
|
|
|
|
|
|
|
|
git checkout simple-change &&
|
|
|
|
>unrelated-change &&
|
|
|
|
git add unrelated-change &&
|
|
|
|
git commit -m unrelated-change
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'massive simple rename does not spam added files' '
|
2012-02-12 02:05:12 +01:00
|
|
|
sane_unset GIT_MERGE_VERBOSITY &&
|
2010-09-20 10:28:36 +02:00
|
|
|
git merge --no-stat simple-rename | grep -v Removing >output &&
|
2012-04-11 13:24:01 +02:00
|
|
|
test_line_count -lt 5 output
|
2010-09-20 10:28:36 +02:00
|
|
|
'
|
|
|
|
|
2008-04-30 19:23:55 +02:00
|
|
|
test_done
|