t55[4-9]*: 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' -e 's/retsam/niam/g' \ -- t55[4-9]*.sh t556x*) This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for those tests. Note that t5541 uses the reversed `master` name: `retsam`. We replace it by the equivalent for `main`: `niam`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
committed by
Junio C Hamano
Junio C Hamano
parent
3ac8f6301e
commit
028cb644ec
@ -4,7 +4,7 @@
|
||||
#
|
||||
|
||||
test_description='test smart pushing over http via http-backend'
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
||||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||||
|
||||
. ./test-lib.sh
|
||||
@ -145,23 +145,23 @@ test_expect_success 'used receive-pack service' '
|
||||
'
|
||||
|
||||
test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
|
||||
"$ROOT_PATH"/test_repo_clone master success
|
||||
"$ROOT_PATH"/test_repo_clone main success
|
||||
|
||||
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' '
|
||||
# create a dissimilarly-named remote ref so that git is unable to match the
|
||||
# two refs (viz. local, remote) unless an explicit refspec is provided.
|
||||
git push origin master:retsam &&
|
||||
git push origin main:niam &&
|
||||
|
||||
echo "change changed" > path2 &&
|
||||
git commit -a -m path2 --amend &&
|
||||
|
||||
# push master too; this ensures there is at least one '"'push'"' command to
|
||||
# push main too; this ensures there is at least one '"'push'"' command to
|
||||
# the remote helper and triggers interaction with the helper.
|
||||
test_must_fail git push -v origin +master master:retsam >output 2>&1'
|
||||
test_must_fail git push -v origin +main main:niam >output 2>&1'
|
||||
|
||||
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: remote output' '
|
||||
grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *master -> master (forced update)$" output &&
|
||||
grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output
|
||||
grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *main -> main (forced update)$" output &&
|
||||
grep "^ ! \[rejected\] *main -> niam (non-fast-forward)$" output
|
||||
'
|
||||
|
||||
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
|
||||
@ -170,7 +170,7 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
|
||||
'
|
||||
|
||||
test_expect_success 'push (chunked)' '
|
||||
git checkout master &&
|
||||
git checkout main &&
|
||||
test_commit commit path3 &&
|
||||
HEAD=$(git rev-parse --verify HEAD) &&
|
||||
test_config http.postbuffer 4 &&
|
||||
@ -180,9 +180,9 @@ test_expect_success 'push (chunked)' '
|
||||
test $HEAD = $(git rev-parse --verify HEAD))
|
||||
'
|
||||
|
||||
## References of remote: atomic1(1) master(2) collateral(2) other(2)
|
||||
## References of local : atomic2(2) master(1) collateral(3) other(2) collateral1(3) atomic(1)
|
||||
## Atomic push : master(1) collateral(3) atomic(1)
|
||||
## References of remote: atomic1(1) main(2) collateral(2) other(2)
|
||||
## References of local : atomic2(2) main(1) collateral(3) other(2) collateral1(3) atomic(1)
|
||||
## Atomic push : main(1) collateral(3) atomic(1)
|
||||
test_expect_success 'push --atomic also prevents branch creation, reports collateral' '
|
||||
# Setup upstream repo - empty for now
|
||||
d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-branches.git &&
|
||||
@ -195,15 +195,15 @@ test_expect_success 'push --atomic also prevents branch creation, reports collat
|
||||
test_commit atomic2 &&
|
||||
git branch collateral &&
|
||||
git branch other &&
|
||||
git push "$up" atomic1 master collateral other &&
|
||||
git push "$up" atomic1 main collateral other &&
|
||||
git tag -d atomic1 &&
|
||||
|
||||
# collateral is a valid push, but should be failed by atomic push
|
||||
git checkout collateral &&
|
||||
test_commit collateral1 &&
|
||||
|
||||
# Make master incompatible with upstream to provoke atomic
|
||||
git checkout master &&
|
||||
# Make main incompatible with upstream to provoke atomic
|
||||
git checkout main &&
|
||||
git reset --hard HEAD^ &&
|
||||
|
||||
# Add a new branch which should be failed by atomic push. This is a
|
||||
@ -211,7 +211,7 @@ test_expect_success 'push --atomic also prevents branch creation, reports collat
|
||||
git branch atomic &&
|
||||
|
||||
# --atomic should cause entire push to be rejected
|
||||
test_must_fail git push --atomic "$up" master atomic collateral 2>output &&
|
||||
test_must_fail git push --atomic "$up" main atomic collateral 2>output &&
|
||||
|
||||
# the new branch should not have been created upstream
|
||||
test_must_fail git -C "$d" show-ref --verify refs/heads/atomic &&
|
||||
@ -219,15 +219,15 @@ test_expect_success 'push --atomic also prevents branch creation, reports collat
|
||||
# upstream should still reflect atomic2, the last thing we pushed
|
||||
# successfully
|
||||
git rev-parse atomic2 >expected &&
|
||||
# on master...
|
||||
git -C "$d" rev-parse refs/heads/master >actual &&
|
||||
# on main...
|
||||
git -C "$d" rev-parse refs/heads/main >actual &&
|
||||
test_cmp expected actual &&
|
||||
# ...and collateral.
|
||||
git -C "$d" rev-parse refs/heads/collateral >actual &&
|
||||
test_cmp expected actual &&
|
||||
|
||||
# the failed refs should be indicated to the user
|
||||
grep "^ ! .*rejected.* master -> master" output &&
|
||||
grep "^ ! .*rejected.* main -> main" output &&
|
||||
|
||||
# the collateral failure refs should be indicated to the user
|
||||
grep "^ ! .*rejected.* atomic -> atomic .*atomic push failed" output &&
|
||||
@ -475,9 +475,9 @@ test_expect_success 'clone/fetch scrubs password from reflogs' '
|
||||
test_commit prepare-for-force-fetch &&
|
||||
git switch -c away &&
|
||||
git fetch "$HTTPD_URL_USER_PASS/smart/test_repo.git" \
|
||||
+master:master &&
|
||||
+main:main &&
|
||||
# should have been scrubbed down to vanilla URL
|
||||
git log -g master >reflog &&
|
||||
git log -g main >reflog &&
|
||||
grep "$HTTPD_URL" reflog &&
|
||||
! grep "$HTTPD_URL_USER_PASS" reflog
|
||||
'
|
||||
@ -501,7 +501,7 @@ test_expect_success 'colorize errors/hints' '
|
||||
cd "$ROOT_PATH"/test_repo_clone &&
|
||||
test_must_fail git -c color.transport=always -c color.advice=always \
|
||||
-c color.push=always \
|
||||
push origin origin/master^:master 2>act &&
|
||||
push origin origin/main^:main 2>act &&
|
||||
test_decode_color <act >decoded &&
|
||||
test_i18ngrep "<RED>.*rejected.*<RESET>" decoded &&
|
||||
test_i18ngrep "<RED>error: failed to push some refs" decoded &&
|
||||
|
||||
Reference in New Issue
Block a user