git-commit-vandalism/t/t5582-fetch-negative-refspec.sh
Johannes Schindelin 334afbc76f 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 15:44:17 -08:00

193 lines
5.2 KiB
Bash
Executable File

#!/bin/sh
# Copyright (c) 2020, Jacob Keller.
test_description='"git fetch" with negative refspecs.
'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
test_expect_success setup '
echo >file original &&
git add file &&
git commit -a -m original
'
test_expect_success "clone and setup child repos" '
git clone . one &&
(
cd one &&
echo >file updated by one &&
git commit -a -m "updated by one" &&
git switch -c alternate &&
echo >file updated again by one &&
git commit -a -m "updated by one again" &&
git switch master
) &&
git clone . two &&
(
cd two &&
git config branch.master.remote one &&
git config remote.one.url ../one/.git/ &&
git config remote.one.fetch +refs/heads/*:refs/remotes/one/* &&
git config --add remote.one.fetch ^refs/heads/alternate
) &&
git clone . three
'
test_expect_success "fetch one" '
echo >file updated by origin &&
git commit -a -m "updated by origin" &&
(
cd two &&
test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
git fetch one &&
test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
git rev-parse --verify refs/remotes/one/master &&
mine=$(git rev-parse refs/remotes/one/master) &&
his=$(cd ../one && git rev-parse refs/heads/master) &&
test "z$mine" = "z$his"
)
'
test_expect_success "fetch with negative refspec on commandline" '
echo >file updated by origin again &&
git commit -a -m "updated by origin again" &&
(
cd three &&
alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
echo $alternate_in_one >expect &&
git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/master &&
cut -f -1 .git/FETCH_HEAD >actual &&
test_cmp expect actual
)
'
test_expect_success "fetch with negative sha1 refspec fails" '
echo >file updated by origin yet again &&
git commit -a -m "updated by origin yet again" &&
(
cd three &&
master_in_one=$(cd ../one && git rev-parse refs/heads/master) &&
test_must_fail git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^$master_in_one
)
'
test_expect_success "fetch with negative pattern refspec" '
echo >file updated by origin once more &&
git commit -a -m "updated by origin once more" &&
(
cd three &&
alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
echo $alternate_in_one >expect &&
git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/m* &&
cut -f -1 .git/FETCH_HEAD >actual &&
test_cmp expect actual
)
'
test_expect_success "fetch with negative pattern refspec does not expand prefix" '
echo >file updated by origin another time &&
git commit -a -m "updated by origin another time" &&
(
cd three &&
alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
master_in_one=$(cd ../one && git rev-parse refs/heads/master) &&
echo $alternate_in_one >expect &&
echo $master_in_one >>expect &&
git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^master &&
cut -f -1 .git/FETCH_HEAD >actual &&
test_cmp expect actual
)
'
test_expect_success "fetch with negative refspec avoids duplicate conflict" '
cd "$D" &&
(
cd one &&
git branch dups/a &&
git branch dups/b &&
git branch dups/c &&
git branch other/a &&
git rev-parse --verify refs/heads/other/a >../expect &&
git rev-parse --verify refs/heads/dups/b >>../expect &&
git rev-parse --verify refs/heads/dups/c >>../expect
) &&
(
cd three &&
git fetch ../one/.git ^refs/heads/dups/a refs/heads/dups/*:refs/dups/* refs/heads/other/a:refs/dups/a &&
git rev-parse --verify refs/dups/a >../actual &&
git rev-parse --verify refs/dups/b >>../actual &&
git rev-parse --verify refs/dups/c >>../actual
) &&
test_cmp expect actual
'
test_expect_success "push --prune with negative refspec" '
(
cd two &&
git branch prune/a &&
git branch prune/b &&
git branch prune/c &&
git push ../three refs/heads/prune/* &&
git branch -d prune/a &&
git branch -d prune/b &&
git push --prune ../three refs/heads/prune/* ^refs/heads/prune/b
) &&
(
cd three &&
test_write_lines b c >expect &&
git for-each-ref --format="%(refname:lstrip=3)" refs/heads/prune/ >actual &&
test_cmp expect actual
)
'
test_expect_success "push --prune with negative refspec apply to the destination" '
(
cd two &&
git branch ours/a &&
git branch ours/b &&
git branch ours/c &&
git push ../three refs/heads/ours/*:refs/heads/theirs/* &&
git branch -d ours/a &&
git branch -d ours/b &&
git push --prune ../three refs/heads/ours/*:refs/heads/theirs/* ^refs/heads/theirs/b
) &&
(
cd three &&
test_write_lines b c >expect &&
git for-each-ref --format="%(refname:lstrip=3)" refs/heads/theirs/ >actual &&
test_cmp expect actual
)
'
test_expect_success "fetch --prune with negative refspec" '
(
cd two &&
git branch fetch/a &&
git branch fetch/b &&
git branch fetch/c
) &&
(
cd three &&
git fetch ../two/.git refs/heads/fetch/*:refs/heads/copied/*
) &&
(
cd two &&
git branch -d fetch/a &&
git branch -d fetch/b
) &&
(
cd three &&
test_write_lines b c >expect &&
git fetch -v ../two/.git --prune refs/heads/fetch/*:refs/heads/copied/* ^refs/heads/fetch/b &&
git for-each-ref --format="%(refname:lstrip=3)" refs/heads/copied/ >actual &&
test_cmp expect actual
)
'
test_done