diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 00:44:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-20 00:44:18 +0100 |
| commit | 3275f4e886b124b832b8b822c48e3e07b5b143ed (patch) | |
| tree | 8c74af5ca53a141f7cffbf2e68773911f27d1a77 /t/t5501-fetch-push-alternates.sh | |
| parent | t5503: prepare aligned comment for replacing `master` with `main` (diff) | |
| download | git-3275f4e886b124b832b8b822c48e3e07b5b143ed.tar.xz git-3275f4e886b124b832b8b822c48e3e07b5b143ed.zip | |
t550*: adjust the references to the default branch name "main"
This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
-e 's/Master/Main/g' -- t550*.sh)
This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main`
for those tests.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5501-fetch-push-alternates.sh')
| -rwxr-xr-x | t/t5501-fetch-push-alternates.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t5501-fetch-push-alternates.sh b/t/t5501-fetch-push-alternates.sh index 96ce28b6ba..66f19a4ef2 100755 --- a/t/t5501-fetch-push-alternates.sh +++ b/t/t5501-fetch-push-alternates.sh @@ -1,7 +1,7 @@ #!/bin/sh test_description='fetch/push involving alternates' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -48,7 +48,7 @@ test_expect_success setup ' test_expect_success 'pushing into a repository with the same alternate' ' ( cd one && - git push ../receiver master:refs/heads/it + git push ../receiver main:refs/heads/it ) && ( cd receiver && @@ -60,7 +60,7 @@ test_expect_success 'pushing into a repository with the same alternate' ' test_expect_success 'fetching from a repository with the same alternate' ' ( cd fetcher && - git fetch ../one master:refs/heads/it && + git fetch ../one main:refs/heads/it && count_objects >../fetcher.count ) && test_cmp one.count fetcher.count |