2007-11-28 19:55:46 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
2008-09-09 23:25:27 +02:00
|
|
|
test_description='git cvsimport basic tests'
|
2020-11-19 00:44:43 +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
|
|
|
|
|
2009-02-23 06:08:10 +01:00
|
|
|
. ./lib-cvs.sh
|
2007-11-28 19:55:46 +01:00
|
|
|
|
2017-02-27 12:26:28 +01:00
|
|
|
if ! test_have_prereq NOT_ROOT; then
|
|
|
|
skip_all='When cvs is compiled with CVS_BADROOT commits as root fail'
|
|
|
|
test_done
|
|
|
|
fi
|
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'setup cvsroot environment' '
|
|
|
|
CVSROOT=$(pwd)/cvsroot &&
|
|
|
|
export CVSROOT
|
|
|
|
'
|
2007-12-04 02:41:45 +01:00
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'setup cvsroot' '$CVS init'
|
2007-11-28 19:55:46 +01:00
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'setup a cvs module' '
|
2007-11-28 19:55:46 +01:00
|
|
|
|
2008-05-04 07:37:59 +02:00
|
|
|
mkdir "$CVSROOT/module" &&
|
2009-02-23 06:08:11 +01:00
|
|
|
$CVS co -d module-cvs module &&
|
2010-09-06 20:39:54 +02:00
|
|
|
(cd module-cvs &&
|
2007-11-28 19:55:46 +01:00
|
|
|
cat <<EOF >o_fortuna &&
|
|
|
|
O Fortuna
|
|
|
|
velut luna
|
|
|
|
statu variabilis,
|
|
|
|
|
|
|
|
semper crescis
|
|
|
|
aut decrescis;
|
|
|
|
vita detestabilis
|
|
|
|
|
|
|
|
nunc obdurat
|
|
|
|
et tunc curat
|
|
|
|
ludo mentis aciem,
|
|
|
|
|
|
|
|
egestatem,
|
|
|
|
potestatem
|
|
|
|
dissolvit ut glaciem.
|
|
|
|
EOF
|
2009-02-23 06:08:11 +01:00
|
|
|
$CVS add o_fortuna &&
|
2007-11-28 19:55:46 +01:00
|
|
|
cat <<EOF >message &&
|
|
|
|
add "O Fortuna" lyrics
|
|
|
|
|
|
|
|
These public domain lyrics make an excellent sample text.
|
|
|
|
EOF
|
2010-09-06 20:39:54 +02:00
|
|
|
$CVS commit -F message
|
|
|
|
)
|
2007-11-28 19:55:46 +01:00
|
|
|
'
|
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'import a trivial module' '
|
2007-11-28 19:55:46 +01:00
|
|
|
|
2010-02-06 19:26:24 +01:00
|
|
|
git cvsimport -a -R -z 0 -C module-git module &&
|
2008-05-24 07:28:56 +02:00
|
|
|
test_cmp module-cvs/o_fortuna module-git/o_fortuna
|
2007-11-28 19:55:46 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2010-09-07 01:46:36 +02:00
|
|
|
test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
|
2007-11-28 19:56:11 +01:00
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
|
2010-02-06 19:26:24 +01:00
|
|
|
|
|
|
|
(cd module-git &&
|
|
|
|
git log --format="o_fortuna 1.1 %H" -1) > expected &&
|
|
|
|
test_cmp expected module-git/.git/cvs-revisions
|
|
|
|
'
|
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'update cvs module' '
|
2010-09-06 20:39:54 +02:00
|
|
|
(cd module-cvs &&
|
2007-11-28 19:55:46 +01:00
|
|
|
cat <<EOF >o_fortuna &&
|
|
|
|
O Fortune,
|
|
|
|
like the moon
|
|
|
|
you are changeable,
|
|
|
|
|
|
|
|
ever waxing
|
|
|
|
and waning;
|
|
|
|
hateful life
|
|
|
|
|
|
|
|
first oppresses
|
|
|
|
and then soothes
|
|
|
|
as fancy takes it;
|
|
|
|
|
|
|
|
poverty
|
|
|
|
and power
|
|
|
|
it melts them like ice.
|
|
|
|
EOF
|
|
|
|
cat <<EOF >message &&
|
|
|
|
translate to English
|
|
|
|
|
|
|
|
My Latin is terrible.
|
|
|
|
EOF
|
2010-09-06 20:39:54 +02:00
|
|
|
$CVS commit -F message
|
|
|
|
)
|
2007-11-28 19:55:46 +01:00
|
|
|
'
|
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'update git module' '
|
2007-11-28 19:55:46 +01:00
|
|
|
|
2010-09-06 20:39:54 +02:00
|
|
|
(cd module-git &&
|
2010-12-29 22:55:34 +01:00
|
|
|
git config cvsimport.trackRevisions true &&
|
|
|
|
git cvsimport -a -z 0 module &&
|
2010-09-06 20:39:54 +02:00
|
|
|
git merge origin
|
|
|
|
) &&
|
2008-05-24 07:28:56 +02:00
|
|
|
test_cmp module-cvs/o_fortuna module-git/o_fortuna
|
2007-11-28 19:55:46 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'update has correct .git/cvs-revisions' '
|
2010-02-06 19:26:24 +01:00
|
|
|
|
|
|
|
(cd module-git &&
|
|
|
|
git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
|
|
|
|
git log --format="o_fortuna 1.2 %H" -1 HEAD) > expected &&
|
|
|
|
test_cmp expected module-git/.git/cvs-revisions
|
|
|
|
'
|
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'update cvs module' '
|
2007-11-30 23:22:12 +01:00
|
|
|
|
2010-09-06 20:39:54 +02:00
|
|
|
(cd module-cvs &&
|
2007-11-30 23:22:12 +01:00
|
|
|
echo 1 >tick &&
|
2009-02-23 06:08:11 +01:00
|
|
|
$CVS add tick &&
|
|
|
|
$CVS commit -m 1
|
2010-09-06 20:39:54 +02:00
|
|
|
)
|
2007-11-30 23:22:12 +01:00
|
|
|
'
|
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'cvsimport.module config works' '
|
2007-11-30 23:22:12 +01:00
|
|
|
|
2010-09-06 20:39:54 +02:00
|
|
|
(cd module-git &&
|
2007-11-30 23:22:12 +01:00
|
|
|
git config cvsimport.module module &&
|
2010-12-29 22:55:34 +01:00
|
|
|
git config cvsimport.trackRevisions true &&
|
|
|
|
git cvsimport -a -z0 &&
|
2010-09-06 20:39:54 +02:00
|
|
|
git merge origin
|
|
|
|
) &&
|
2008-05-24 07:28:56 +02:00
|
|
|
test_cmp module-cvs/tick module-git/tick
|
2007-11-30 23:22:12 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'second update has correct .git/cvs-revisions' '
|
2010-02-06 19:26:24 +01:00
|
|
|
|
|
|
|
(cd module-git &&
|
|
|
|
git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
|
2018-07-02 02:24:04 +02:00
|
|
|
git log --format="o_fortuna 1.2 %H" -1 HEAD^ &&
|
2010-02-06 19:26:24 +01:00
|
|
|
git log --format="tick 1.1 %H" -1 HEAD) > expected &&
|
|
|
|
test_cmp expected module-git/.git/cvs-revisions
|
|
|
|
'
|
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'import from a CVS working tree' '
|
2007-12-02 18:22:19 +01:00
|
|
|
|
2009-02-23 06:08:11 +01:00
|
|
|
$CVS co -d import-from-wt module &&
|
2010-09-06 20:39:54 +02:00
|
|
|
(cd import-from-wt &&
|
2010-12-29 22:55:34 +01:00
|
|
|
git config cvsimport.trackRevisions false &&
|
2007-12-02 18:22:19 +01:00
|
|
|
git cvsimport -a -z0 &&
|
|
|
|
echo 1 >expect &&
|
|
|
|
git log -1 --pretty=format:%s%n >actual &&
|
2018-10-05 23:54:04 +02:00
|
|
|
test_cmp expect actual
|
2010-09-06 20:39:54 +02:00
|
|
|
)
|
2007-12-02 18:22:19 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2010-08-13 22:40:07 +02:00
|
|
|
test_expect_success PERL 'no .git/cvs-revisions created by default' '
|
2010-02-06 19:26:24 +01:00
|
|
|
|
|
|
|
! test -e import-from-wt/.git/cvs-revisions
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2020-11-19 00:44:43 +01:00
|
|
|
test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree main'
|
2009-02-23 06:08:12 +01:00
|
|
|
|
2007-11-28 19:55:46 +01:00
|
|
|
test_done
|