mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5703: use main as initial branch name

Browse Source 
In 97cf8d50b5 (t5703: adjust a test case for the upcoming default
branch name, 2020-10-23), we prepared this test script for a world when
the default initial branch name would be `main`.

However, there is no need to wait for that: let's adjust the test script
to stop relying on a specific initial branch name by setting it
explicitly. This allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq
from one test case.

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
2020-12-17 01:07:07 +00:00
committed by Junio C Hamano
parent 83ecf26ee7
commit 72dc172804
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
t/t5703-upload-pack-ref-in-want.sh
View File

@ -38,12 +38,13 @@ write_command () {
# c(o/foo) d(o/bar) # c(o/foo) d(o/bar)
# \ / # \ /
# b e(baz) f(master) # b e(baz) f(main)
# \__ | __/ # \__ | __/
# \ | / # \ | /
# a # a
test_expect_success 'setup repository' ' test_expect_success 'setup repository' '
test_commit a && test_commit a &&
git branch -M main &&
git checkout -b o/foo && git checkout -b o/foo &&
test_commit b && test_commit b &&
test_commit c && test_commit c &&
@ -51,7 +52,7 @@ test_expect_success 'setup repository' '
test_commit d && test_commit d &&
git checkout -b baz a && git checkout -b baz a &&
test_commit e && test_commit e &&
git checkout master && git checkout main &&
test_commit f test_commit f
' '
@ -88,7 +89,7 @@ test_expect_success 'invalid want-ref line' '
test_expect_success 'basic want-ref' ' test_expect_success 'basic want-ref' '
oid=$(git rev-parse f) && oid=$(git rev-parse f) &&
cat >expected_refs <<-EOF && cat >expected_refs <<-EOF &&
$oid refs/heads/master $oid refs/heads/main
EOF EOF
git rev-parse f >expected_commits && git rev-parse f >expected_commits &&
@ -97,7 +98,7 @@ test_expect_success 'basic want-ref' '
$(write_command fetch) $(write_command fetch)
0001 0001
no-progress no-progress
want-ref refs/heads/master want-ref refs/heads/main
have $oid have $oid
done done
0000 0000
@ -135,7 +136,7 @@ test_expect_success 'multiple want-ref lines' '
test_expect_success 'mix want and want-ref' ' test_expect_success 'mix want and want-ref' '
oid=$(git rev-parse f) && oid=$(git rev-parse f) &&
cat >expected_refs <<-EOF && cat >expected_refs <<-EOF &&
$oid refs/heads/master $oid refs/heads/main
EOF EOF
git rev-parse e f >expected_commits && git rev-parse e f >expected_commits &&
@ -143,7 +144,7 @@ test_expect_success 'mix want and want-ref' '
$(write_command fetch) $(write_command fetch)
0001 0001
no-progress no-progress
want-ref refs/heads/master want-ref refs/heads/main
want $(git rev-parse e) want $(git rev-parse e)
have $(git rev-parse a) have $(git rev-parse a)
done done
@ -182,7 +183,7 @@ LOCAL_PRISTINE="$(pwd)/local_pristine"
# $REPO # $REPO
# c(o/foo) d(o/bar) # c(o/foo) d(o/bar)
# \ / # \ /
# b e(baz) f(master) # b e(baz) f(main)
# \__ | __/ # \__ | __/
# \ | / # \ | /
# a # a
@ -193,10 +194,10 @@ LOCAL_PRISTINE="$(pwd)/local_pristine"
# . # .
# . # .
# | # |
# a(master) # a(main)
test_expect_success 'setup repos for fetching with ref-in-want tests' ' test_expect_success 'setup repos for fetching with ref-in-want tests' '
( (
git init "$REPO" && git init -b main "$REPO" &&
cd "$REPO" && cd "$REPO" &&
test_commit a && test_commit a &&
@ -209,7 +210,7 @@ test_expect_success 'setup repos for fetching with ref-in-want tests' '
test_commit_bulk --id=s 33 && test_commit_bulk --id=s 33 &&
# Add novel commits to upstream # Add novel commits to upstream
git checkout master && git checkout main &&
cd "$REPO" && cd "$REPO" &&
git checkout -b o/foo && git checkout -b o/foo &&
test_commit b && test_commit b &&
@ -218,7 +219,7 @@ test_expect_success 'setup repos for fetching with ref-in-want tests' '
test_commit d && test_commit d &&
git checkout -b baz a && git checkout -b baz a &&
test_commit e && test_commit e &&
git checkout master && git checkout main &&
test_commit f test_commit f
) && ) &&
git -C "$REPO" config uploadpack.allowRefInWant true && git -C "$REPO" config uploadpack.allowRefInWant true &&
@ -245,12 +246,12 @@ test_expect_success 'fetching multiple refs' '
rm -rf local && rm -rf local &&
cp -r "$LOCAL_PRISTINE" local && cp -r "$LOCAL_PRISTINE" local &&
GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin master baz && GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin main baz &&
git -C "$REPO" rev-parse "master" "baz" >expected && git -C "$REPO" rev-parse "main" "baz" >expected &&
git -C local rev-parse refs/remotes/origin/master refs/remotes/origin/baz >actual && git -C local rev-parse refs/remotes/origin/main refs/remotes/origin/baz >actual &&
test_cmp expected actual && test_cmp expected actual &&
grep "want-ref refs/heads/master" log && grep "want-ref refs/heads/main" log &&
grep "want-ref refs/heads/baz" log grep "want-ref refs/heads/baz" log
' '
@ -261,13 +262,13 @@ test_expect_success 'fetching ref and exact OID' '
cp -r "$LOCAL_PRISTINE" local && cp -r "$LOCAL_PRISTINE" local &&
oid=$(git -C "$REPO" rev-parse b) && oid=$(git -C "$REPO" rev-parse b) &&
GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \ GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
master "$oid":refs/heads/actual && main "$oid":refs/heads/actual &&
git -C "$REPO" rev-parse "master" "b" >expected && git -C "$REPO" rev-parse "main" "b" >expected &&
git -C local rev-parse refs/remotes/origin/master refs/heads/actual >actual && git -C local rev-parse refs/remotes/origin/main refs/heads/actual >actual &&
test_cmp expected actual && test_cmp expected actual &&
grep "want $oid" log && grep "want $oid" log &&
grep "want-ref refs/heads/master" log grep "want-ref refs/heads/main" log
' '
test_expect_success 'fetching with wildcard that does not match any refs' ' test_expect_success 'fetching with wildcard that does not match any refs' '
@ -301,7 +302,7 @@ LOCAL_PRISTINE="$(pwd)/local_pristine"
test_expect_success 'setup repos for change-while-negotiating test' ' test_expect_success 'setup repos for change-while-negotiating test' '
( (
git init "$REPO" && git init -b main "$REPO" &&
cd "$REPO" && cd "$REPO" &&
>.git/git-daemon-export-ok && >.git/git-daemon-export-ok &&
test_commit m1 && test_commit m1 &&
@ -316,7 +317,7 @@ test_expect_success 'setup repos for change-while-negotiating test' '
test_commit_bulk --id=s 33 && test_commit_bulk --id=s 33 &&
# Add novel commits to upstream # Add novel commits to upstream
git checkout master && git checkout main &&
cd "$REPO" && cd "$REPO" &&
test_commit m2 && test_commit m2 &&
test_commit m3 && test_commit m3 &&
@ -342,7 +343,7 @@ test_expect_success 'server is initially ahead - no ref in want' '
git -C "$REPO" config uploadpack.allowRefInWant false && git -C "$REPO" config uploadpack.allowRefInWant false &&
rm -rf local && rm -rf local &&
cp -r "$LOCAL_PRISTINE" local && cp -r "$LOCAL_PRISTINE" local &&
inconsistency master $(test_oid numeric) && inconsistency main $(test_oid numeric) &&
test_must_fail git -C local fetch 2>err && test_must_fail git -C local fetch 2>err &&
test_i18ngrep "fatal: remote error: upload-pack: not our ref" err test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
' '
@ -351,11 +352,11 @@ test_expect_success 'server is initially ahead - ref in want' '
git -C "$REPO" config uploadpack.allowRefInWant true && git -C "$REPO" config uploadpack.allowRefInWant true &&
rm -rf local && rm -rf local &&
cp -r "$LOCAL_PRISTINE" local && cp -r "$LOCAL_PRISTINE" local &&
inconsistency master $(test_oid numeric) && inconsistency main $(test_oid numeric) &&
git -C local fetch && git -C local fetch &&
git -C "$REPO" rev-parse --verify master >expected && git -C "$REPO" rev-parse --verify main >expected &&
git -C local rev-parse --verify refs/remotes/origin/master >actual && git -C local rev-parse --verify refs/remotes/origin/main >actual &&
test_cmp expected actual test_cmp expected actual
' '
@ -363,11 +364,11 @@ test_expect_success 'server is initially behind - no ref in want' '
git -C "$REPO" config uploadpack.allowRefInWant false && git -C "$REPO" config uploadpack.allowRefInWant false &&
rm -rf local && rm -rf local &&
cp -r "$LOCAL_PRISTINE" local && cp -r "$LOCAL_PRISTINE" local &&
inconsistency master "master^" && inconsistency main "main^" &&
git -C local fetch && git -C local fetch &&
git -C "$REPO" rev-parse --verify "master^" >expected && git -C "$REPO" rev-parse --verify "main^" >expected &&
git -C local rev-parse --verify refs/remotes/origin/master >actual && git -C local rev-parse --verify refs/remotes/origin/main >actual &&
test_cmp expected actual test_cmp expected actual
' '
@ -375,15 +376,15 @@ test_expect_success 'server is initially behind - ref in want' '
git -C "$REPO" config uploadpack.allowRefInWant true && git -C "$REPO" config uploadpack.allowRefInWant true &&
rm -rf local && rm -rf local &&
cp -r "$LOCAL_PRISTINE" local && cp -r "$LOCAL_PRISTINE" local &&
inconsistency master "master^" && inconsistency main "main^" &&
git -C local fetch && git -C local fetch &&
git -C "$REPO" rev-parse --verify "master" >expected && git -C "$REPO" rev-parse --verify "main" >expected &&
git -C local rev-parse --verify refs/remotes/origin/master >actual && git -C local rev-parse --verify refs/remotes/origin/main >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success PREPARE_FOR_MAIN_BRANCH 'server loses a ref - ref in want' ' test_expect_success 'server loses a ref - ref in want' '
git -C "$REPO" config uploadpack.allowRefInWant true && git -C "$REPO" config uploadpack.allowRefInWant true &&
rm -rf local && rm -rf local &&
cp -r "$LOCAL_PRISTINE" local && cp -r "$LOCAL_PRISTINE" local &&