diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-19 23:44:18 (GMT) |
| commit | 3275f4e886b124b832b8b822c48e3e07b5b143ed (patch) | |
| tree | 8c74af5ca53a141f7cffbf2e68773911f27d1a77 /t/t5502-quickfetch.sh | |
| parent | e4010de9f085e14de47d15c02b3f4f2cc5008877 (diff) | |
| download | git-3275f4e886b124b832b8b822c48e3e07b5b143ed.zip git-3275f4e886b124b832b8b822c48e3e07b5b143ed.tar.gz git-3275f4e886b124b832b8b822c48e3e07b5b143ed.tar.bz2 | |
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/t5502-quickfetch.sh')
| -rwxr-xr-x | t/t5502-quickfetch.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t5502-quickfetch.sh b/t/t5502-quickfetch.sh index e15a472..8c05c77 100755 --- a/t/t5502-quickfetch.sh +++ b/t/t5502-quickfetch.sh @@ -2,7 +2,7 @@ test_description='test quickfetch from local' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -111,14 +111,14 @@ test_expect_success 'quickfetch should not copy from alternate' ' q }" ) ) && - origin_master=$( ( + origin_main=$( ( cd quickclone && - git rev-parse origin/master + git rev-parse origin/main ) ) && echo "loose objects: $obj_cnt, packfiles: $pck_cnt" && test $obj_cnt -eq 0 && test $pck_cnt -eq 0 && - test z$origin_master = z$(git rev-parse master) + test z$origin_main = z$(git rev-parse main) ' |