git/t/t5519-push-alternates.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

146 lines
3.4 KiB
Bash
Executable file

#!/bin/sh
test_description='push to a repository that borrows from elsewhere'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
test_expect_success setup '
mkdir alice-pub &&
(
cd alice-pub &&
GIT_DIR=. git init
) &&
mkdir alice-work &&
(
cd alice-work &&
git init &&
>file &&
git add . &&
git commit -m initial &&
git push ../alice-pub master
) &&
# Project Bob is a fork of project Alice
mkdir bob-pub &&
(
cd bob-pub &&
GIT_DIR=. git init &&
mkdir -p objects/info &&
echo ../../alice-pub/objects >objects/info/alternates
) &&
git clone alice-pub bob-work &&
(
cd bob-work &&
git push ../bob-pub master
)
'
test_expect_success 'alice works and pushes' '
(
cd alice-work &&
echo more >file &&
git commit -a -m second &&
git push ../alice-pub :
)
'
test_expect_success 'bob fetches from alice, works and pushes' '
(
# Bob acquires what Alice did in his work tree first.
# Even though these objects are not directly in
# the public repository of Bob, this push does not
# need to send the commit Bob received from Alice
# to his public repository, as all the object Alice
# has at her public repository are available to it
# via its alternates.
cd bob-work &&
git pull ../alice-pub master &&
echo more bob >file &&
git commit -a -m third &&
git push ../bob-pub :
) &&
# Check that the second commit by Alice is not sent
# to ../bob-pub
(
cd bob-pub &&
second=$(git rev-parse HEAD^) &&
rm -f objects/info/alternates &&
test_must_fail git cat-file -t $second &&
echo ../../alice-pub/objects >objects/info/alternates
)
'
test_expect_success 'clean-up in case the previous failed' '
(
cd bob-pub &&
echo ../../alice-pub/objects >objects/info/alternates
)
'
test_expect_success 'alice works and pushes again' '
(
# Alice does not care what Bob does. She does not
# even have to be aware of his existence. She just
# keeps working and pushing
cd alice-work &&
echo more alice >file &&
git commit -a -m fourth &&
git push ../alice-pub :
)
'
test_expect_success 'bob works and pushes' '
(
# This time Bob does not pull from Alice, and
# the master branch at her public repository points
# at a commit Bob does not know about. This should
# not prevent the push by Bob from succeeding.
cd bob-work &&
echo yet more bob >file &&
git commit -a -m fifth &&
git push ../bob-pub :
)
'
test_expect_success 'alice works and pushes yet again' '
(
# Alice does not care what Bob does. She does not
# even have to be aware of his existence. She just
# keeps working and pushing
cd alice-work &&
echo more and more alice >file &&
git commit -a -m sixth.1 &&
echo more and more alice >>file &&
git commit -a -m sixth.2 &&
echo more and more alice >>file &&
git commit -a -m sixth.3 &&
git push ../alice-pub :
)
'
test_expect_success 'bob works and pushes again' '
(
cd alice-pub &&
git cat-file commit master >../bob-work/commit
) &&
(
# This time Bob does not pull from Alice, and
# the master branch at her public repository points
# at a commit Bob does not fully know about, but
# he happens to have the commit object (but not the
# necessary tree) in his repository from Alice.
# This should not prevent the push by Bob from
# succeeding.
cd bob-work &&
git hash-object -t commit -w commit &&
echo even more bob >file &&
git commit -a -m seventh &&
git push ../bob-pub :
)
'
test_done