2006-07-25 01:23:03 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
2011-01-31 21:09:53 +01:00
|
|
|
test_description='git rev-list trivial path optimization test
|
|
|
|
|
|
|
|
d/z1
|
|
|
|
b0 b1
|
2020-11-19 00:44:36 +01:00
|
|
|
o------------------------*----o main
|
2011-01-31 21:09:53 +01:00
|
|
|
/ /
|
|
|
|
o---------o----o----o----o side
|
|
|
|
a0 c0 c1 a1 c2
|
|
|
|
d/f0 d/f1
|
|
|
|
d/z0
|
|
|
|
|
|
|
|
'
|
2006-07-25 01:23:03 +02:00
|
|
|
|
2020-11-19 00:44:36 +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
|
|
|
|
|
2006-07-25 01:23:03 +02:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success setup '
|
2011-01-31 21:09:53 +01:00
|
|
|
echo Hello >a &&
|
|
|
|
mkdir d &&
|
|
|
|
echo World >d/f &&
|
|
|
|
echo World >d/z &&
|
|
|
|
git add a d &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "Initial commit" &&
|
|
|
|
git rev-parse --verify HEAD &&
|
|
|
|
git tag initial
|
2006-07-25 01:23:03 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success path-optimization '
|
2011-01-31 21:09:53 +01:00
|
|
|
test_tick &&
|
|
|
|
commit=$(echo "Unchanged tree" | git commit-tree "HEAD^{tree}" -p HEAD) &&
|
|
|
|
test $(git rev-list $commit | wc -l) = 2 &&
|
|
|
|
test $(git rev-list $commit -- . | wc -l) = 1
|
2006-07-25 01:23:03 +02:00
|
|
|
'
|
|
|
|
|
2007-03-23 07:22:07 +01:00
|
|
|
test_expect_success 'further setup' '
|
|
|
|
git checkout -b side &&
|
|
|
|
echo Irrelevant >c &&
|
2011-01-31 21:09:53 +01:00
|
|
|
echo Irrelevant >d/f &&
|
|
|
|
git add c d/f &&
|
|
|
|
test_tick &&
|
2007-03-23 07:22:07 +01:00
|
|
|
git commit -m "Side makes an irrelevant commit" &&
|
2011-01-31 21:09:53 +01:00
|
|
|
git tag side_c0 &&
|
2007-03-23 07:22:07 +01:00
|
|
|
echo "More Irrelevancy" >c &&
|
|
|
|
git add c &&
|
2011-01-31 21:09:53 +01:00
|
|
|
test_tick &&
|
2007-03-23 07:22:07 +01:00
|
|
|
git commit -m "Side makes another irrelevant commit" &&
|
|
|
|
echo Bye >a &&
|
|
|
|
git add a &&
|
2011-01-31 21:09:53 +01:00
|
|
|
test_tick &&
|
2007-03-23 07:22:07 +01:00
|
|
|
git commit -m "Side touches a" &&
|
2011-01-31 21:09:53 +01:00
|
|
|
git tag side_a1 &&
|
2007-03-23 07:22:07 +01:00
|
|
|
echo "Yet more Irrelevancy" >c &&
|
|
|
|
git add c &&
|
2011-01-31 21:09:53 +01:00
|
|
|
test_tick &&
|
2007-03-23 07:22:07 +01:00
|
|
|
git commit -m "Side makes yet another irrelevant commit" &&
|
2020-11-19 00:44:36 +01:00
|
|
|
git checkout main &&
|
2007-03-23 07:22:07 +01:00
|
|
|
echo Another >b &&
|
2011-01-31 21:09:53 +01:00
|
|
|
echo Munged >d/z &&
|
|
|
|
git add b d/z &&
|
|
|
|
test_tick &&
|
2020-11-19 00:44:36 +01:00
|
|
|
git commit -m "Main touches b" &&
|
|
|
|
git tag main_b0 &&
|
2007-03-23 07:22:07 +01:00
|
|
|
git merge side &&
|
|
|
|
echo Touched >b &&
|
|
|
|
git add b &&
|
2011-01-31 21:09:53 +01:00
|
|
|
test_tick &&
|
2020-11-19 00:44:36 +01:00
|
|
|
git commit -m "Main touches b again"
|
2007-03-23 07:22:07 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'path optimization 2' '
|
2011-01-31 21:09:53 +01:00
|
|
|
git rev-parse side_a1 initial >expected &&
|
2007-03-23 07:22:07 +01:00
|
|
|
git rev-list HEAD -- a >actual &&
|
2008-03-12 22:36:36 +01:00
|
|
|
test_cmp expected actual
|
2007-03-23 07:22:07 +01:00
|
|
|
'
|
|
|
|
|
2011-01-31 21:09:53 +01:00
|
|
|
test_expect_success 'pathspec with leading path' '
|
2020-11-19 00:44:36 +01:00
|
|
|
git rev-parse main^ main_b0 side_c0 initial >expected &&
|
2011-01-31 21:09:53 +01:00
|
|
|
git rev-list HEAD -- d >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'pathspec with glob (1)' '
|
2020-11-19 00:44:36 +01:00
|
|
|
git rev-parse main^ main_b0 side_c0 initial >expected &&
|
2011-01-31 21:09:53 +01:00
|
|
|
git rev-list HEAD -- "d/*" >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'pathspec with glob (2)' '
|
|
|
|
git rev-parse side_c0 initial >expected &&
|
|
|
|
git rev-list HEAD -- "d/[a-m]*" >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2006-07-25 01:23:03 +02:00
|
|
|
test_done
|