diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 00:44:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-20 00:44:18 +0100 |
| commit | 3ac8f6301ee9d4bf3f9e58b3ef12ba536005cb9d (patch) | |
| tree | b978c1141f981533cdcd92440738f99c9782d07e /t/t5529-push-errors.sh | |
| parent | t551*: adjust the references to the default branch name "main" (diff) | |
| download | git-3ac8f6301ee9d4bf3f9e58b3ef12ba536005cb9d.tar.xz git-3ac8f6301ee9d4bf3f9e58b3ef12ba536005cb9d.zip | |
t55[23]*: adjust the references to the default branch name "main"
Carefully excluding t5526, which sees independent development elsewhere
at the time of writing, we use `main` as the default branch name in
t55[23]*. This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
-e 's/Master/Main/g' -e 's/naster/nain/g' -- \
t55[23]*.sh &&
git checkout HEAD -- t5526\*)
Note that t5533 contains a variation of the name `master` (`naster`)
that we rename here, too.
This commit allows us to define
`GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for that range of tests.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5529-push-errors.sh')
| -rwxr-xr-x | t/t5529-push-errors.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5529-push-errors.sh b/t/t5529-push-errors.sh index 9871307fd4..ce85fd30ad 100755 --- a/t/t5529-push-errors.sh +++ b/t/t5529-push-errors.sh @@ -32,7 +32,7 @@ test_expect_success 'detect missing branches early' ' test_expect_success 'detect missing sha1 expressions early' ' echo no >rp-ran && echo no >expect && - test_must_fail git push origin master~2:master && + test_must_fail git push origin main~2:main && test_cmp expect rp-ran ' |