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

Merge branch 'js/t6300-hardcode-main'

Browse Source 
Test update.

* js/t6300-hardcode-main:
  t6300: avoid using the default name of the initial branch
This commit is contained in:
Junio C Hamano
2020-12-17 15:06:40 -08:00
parent e5ace7167a 8f19c9fd43
commit f4fb219a97
1 changed files with 90 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
t/t6300-for-each-ref.sh
View File

@ -28,12 +28,13 @@ test_expect_success setup '
echo "Using $datestamp" > one && echo "Using $datestamp" > one &&
git add one && git add one &&
git commit -m "Initial" && git commit -m "Initial" &&
git branch -M main &&
setdate_and_increment && setdate_and_increment &&
git tag -a -m "Tagging at $datestamp" testtag && git tag -a -m "Tagging at $datestamp" testtag &&
git update-ref refs/remotes/origin/master master && git update-ref refs/remotes/origin/main main &&
git remote add origin nowhere && git remote add origin nowhere &&
git config branch.master.remote origin && git config branch.main.remote origin &&
git config branch.master.merge refs/heads/master && git config branch.main.merge refs/heads/main &&
git remote add myfork elsewhere && git remote add myfork elsewhere &&
git config remote.pushdefault myfork && git config remote.pushdefault myfork &&
git config push.default current git config push.default current
@ -41,7 +42,7 @@ test_expect_success setup '
test_atom() { test_atom() {
case "$1" in case "$1" in
head) ref=refs/heads/master ;; head) ref=refs/heads/main ;;
tag) ref=refs/tags/testtag ;; tag) ref=refs/tags/testtag ;;
sym) ref=refs/heads/sym ;; sym) ref=refs/heads/sym ;;
*) ref=$1 ;; *) ref=$1 ;;
@ -76,49 +77,49 @@ test_atom() {
hexlen=$(test_oid hexsz) hexlen=$(test_oid hexsz)
disklen=$(test_oid disklen) disklen=$(test_oid disklen)
test_atom head refname refs/heads/master test_atom head refname refs/heads/main
test_atom head refname: refs/heads/master test_atom head refname: refs/heads/main
test_atom head refname:short master test_atom head refname:short main
test_atom head refname:lstrip=1 heads/master test_atom head refname:lstrip=1 heads/main
test_atom head refname:lstrip=2 master test_atom head refname:lstrip=2 main
test_atom head refname:lstrip=-1 master test_atom head refname:lstrip=-1 main
test_atom head refname:lstrip=-2 heads/master test_atom head refname:lstrip=-2 heads/main
test_atom head refname:rstrip=1 refs/heads test_atom head refname:rstrip=1 refs/heads
test_atom head refname:rstrip=2 refs test_atom head refname:rstrip=2 refs
test_atom head refname:rstrip=-1 refs test_atom head refname:rstrip=-1 refs
test_atom head refname:rstrip=-2 refs/heads test_atom head refname:rstrip=-2 refs/heads
test_atom head refname:strip=1 heads/master test_atom head refname:strip=1 heads/main
test_atom head refname:strip=2 master test_atom head refname:strip=2 main
test_atom head refname:strip=-1 master test_atom head refname:strip=-1 main
test_atom head refname:strip=-2 heads/master test_atom head refname:strip=-2 heads/main
test_atom head upstream refs/remotes/origin/master test_atom head upstream refs/remotes/origin/main
test_atom head upstream:short origin/master test_atom head upstream:short origin/main
test_atom head upstream:lstrip=2 origin/master test_atom head upstream:lstrip=2 origin/main
test_atom head upstream:lstrip=-2 origin/master test_atom head upstream:lstrip=-2 origin/main
test_atom head upstream:rstrip=2 refs/remotes test_atom head upstream:rstrip=2 refs/remotes
test_atom head upstream:rstrip=-2 refs/remotes test_atom head upstream:rstrip=-2 refs/remotes
test_atom head upstream:strip=2 origin/master test_atom head upstream:strip=2 origin/main
test_atom head upstream:strip=-2 origin/master test_atom head upstream:strip=-2 origin/main
test_atom head push refs/remotes/myfork/master test_atom head push refs/remotes/myfork/main
test_atom head push:short myfork/master test_atom head push:short myfork/main
test_atom head push:lstrip=1 remotes/myfork/master test_atom head push:lstrip=1 remotes/myfork/main
test_atom head push:lstrip=-1 master test_atom head push:lstrip=-1 main
test_atom head push:rstrip=1 refs/remotes/myfork test_atom head push:rstrip=1 refs/remotes/myfork
test_atom head push:rstrip=-1 refs test_atom head push:rstrip=-1 refs
test_atom head push:strip=1 remotes/myfork/master test_atom head push:strip=1 remotes/myfork/main
test_atom head push:strip=-1 master test_atom head push:strip=-1 main
test_atom head objecttype commit test_atom head objecttype commit
test_atom head objectsize $((131 + hexlen)) test_atom head objectsize $((131 + hexlen))
test_atom head objectsize:disk $disklen test_atom head objectsize:disk $disklen
test_atom head deltabase $ZERO_OID test_atom head deltabase $ZERO_OID
test_atom head objectname $(git rev-parse refs/heads/master) test_atom head objectname $(git rev-parse refs/heads/main)
test_atom head objectname:short $(git rev-parse --short refs/heads/master) test_atom head objectname:short $(git rev-parse --short refs/heads/main)
test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/master) test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/main)
test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/master) test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/main)
test_atom head tree $(git rev-parse refs/heads/master^{tree}) test_atom head tree $(git rev-parse refs/heads/main^{tree})
test_atom head tree:short $(git rev-parse --short refs/heads/master^{tree}) test_atom head tree:short $(git rev-parse --short refs/heads/main^{tree})
test_atom head tree:short=1 $(git rev-parse --short=1 refs/heads/master^{tree}) test_atom head tree:short=1 $(git rev-parse --short=1 refs/heads/main^{tree})
test_atom head tree:short=10 $(git rev-parse --short=10 refs/heads/master^{tree}) test_atom head tree:short=10 $(git rev-parse --short=10 refs/heads/main^{tree})
test_atom head parent '' test_atom head parent ''
test_atom head parent:short '' test_atom head parent:short ''
test_atom head parent:short=1 '' test_atom head parent:short=1 ''
@ -171,8 +172,8 @@ test_atom tag deltabase $ZERO_OID
test_atom tag '*deltabase' $ZERO_OID test_atom tag '*deltabase' $ZERO_OID
test_atom tag objectname $(git rev-parse refs/tags/testtag) test_atom tag objectname $(git rev-parse refs/tags/testtag)
test_atom tag objectname:short $(git rev-parse --short refs/tags/testtag) test_atom tag objectname:short $(git rev-parse --short refs/tags/testtag)
test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/master) test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/main)
test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/master) test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/main)
test_atom tag tree '' test_atom tag tree ''
test_atom tag tree:short '' test_atom tag tree:short ''
test_atom tag tree:short=1 '' test_atom tag tree:short=1 ''
@ -253,7 +254,7 @@ test_date () {
author_date=$3 && author_date=$3 &&
tagger_date=$4 && tagger_date=$4 &&
cat >expected <<-EOF && cat >expected <<-EOF &&
'refs/heads/master' '$committer_date' '$author_date' 'refs/heads/main' '$committer_date' '$author_date'
'refs/tags/testtag' '$tagger_date' 'refs/tags/testtag' '$tagger_date'
EOF EOF
( (
@ -375,8 +376,8 @@ test_expect_success 'exercise strftime with odd fields' '
' '
cat >expected <<\EOF cat >expected <<\EOF
refs/heads/master refs/heads/main
refs/remotes/origin/master refs/remotes/origin/main
refs/tags/testtag refs/tags/testtag
EOF EOF
@ -388,8 +389,8 @@ test_expect_success 'Verify ascending sort' '
cat >expected <<\EOF cat >expected <<\EOF
refs/tags/testtag refs/tags/testtag
refs/remotes/origin/master refs/remotes/origin/main
refs/heads/master refs/heads/main
EOF EOF
test_expect_success 'Verify descending sort' ' test_expect_success 'Verify descending sort' '
@ -424,8 +425,8 @@ test_expect_success 'exercise glob patterns with prefixes' '
' '
cat >expected <<\EOF cat >expected <<\EOF
'refs/heads/master' 'refs/heads/main'
'refs/remotes/origin/master' 'refs/remotes/origin/main'
'refs/tags/testtag' 'refs/tags/testtag'
EOF EOF
@ -445,8 +446,8 @@ test_expect_success 'Quoting style: python' '
' '
cat >expected <<\EOF cat >expected <<\EOF
"refs/heads/master" "refs/heads/main"
"refs/remotes/origin/master" "refs/remotes/origin/main"
"refs/tags/testtag" "refs/tags/testtag"
EOF EOF
@ -473,8 +474,8 @@ test_atom head upstream:nobracket,track 'ahead 1'
test_expect_success 'setup for push:track[short]' ' test_expect_success 'setup for push:track[short]' '
test_commit third && test_commit third &&
git update-ref refs/remotes/myfork/master master && git update-ref refs/remotes/myfork/main main &&
git reset master~1 git reset main~1
' '
test_atom head push:track '[behind 1]' test_atom head push:track '[behind 1]'
@ -490,8 +491,8 @@ test_expect_success 'Check that :track[short] works when upstream is invalid' '
[gone] [gone]
EOF EOF
test_when_finished "git config branch.master.merge refs/heads/master" && test_when_finished "git config branch.main.merge refs/heads/main" &&
git config branch.master.merge refs/heads/does-not-exist && git config branch.main.merge refs/heads/does-not-exist &&
git for-each-ref \ git for-each-ref \
--format="%(upstream:track)$LF%(upstream:trackshort)" \ --format="%(upstream:track)$LF%(upstream:trackshort)" \
refs/heads >actual && refs/heads >actual &&
@ -504,9 +505,9 @@ test_expect_success 'Check for invalid refname format' '
test_expect_success 'set up color tests' ' test_expect_success 'set up color tests' '
cat >expected.color <<-EOF && cat >expected.color <<-EOF &&
$(git rev-parse --short refs/heads/master) <GREEN>master<RESET> $(git rev-parse --short refs/heads/main) <GREEN>main<RESET>
$(git rev-parse --short refs/remotes/myfork/master) <GREEN>myfork/master<RESET> $(git rev-parse --short refs/remotes/myfork/main) <GREEN>myfork/main<RESET>
$(git rev-parse --short refs/remotes/origin/master) <GREEN>origin/master<RESET> $(git rev-parse --short refs/remotes/origin/main) <GREEN>origin/main<RESET>
$(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET> $(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET>
$(git rev-parse --short refs/tags/third) <GREEN>third<RESET> $(git rev-parse --short refs/tags/third) <GREEN>third<RESET>
$(git rev-parse --short refs/tags/two) <GREEN>two<RESET> $(git rev-parse --short refs/tags/two) <GREEN>two<RESET>
@ -538,8 +539,8 @@ test_expect_success 'color.ui=always does not override tty check' '
' '
cat >expected <<\EOF cat >expected <<\EOF
heads/master heads/main
tags/master tags/main
EOF EOF
test_expect_success 'Check ambiguous head and tag refs (strict)' ' test_expect_success 'Check ambiguous head and tag refs (strict)' '
@ -549,19 +550,19 @@ test_expect_success 'Check ambiguous head and tag refs (strict)' '
git add one && git add one &&
git commit -m "Branch" && git commit -m "Branch" &&
setdate_and_increment && setdate_and_increment &&
git tag -m "Tagging at $datestamp" master && git tag -m "Tagging at $datestamp" main &&
git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual && git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
test_cmp expected actual test_cmp expected actual
' '
cat >expected <<\EOF cat >expected <<\EOF
heads/master heads/main
master main
EOF EOF
test_expect_success 'Check ambiguous head and tag refs (loose)' ' test_expect_success 'Check ambiguous head and tag refs (loose)' '
git config --bool core.warnambiguousrefs false && git config --bool core.warnambiguousrefs false &&
git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual && git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
test_cmp expected actual test_cmp expected actual
' '
@ -571,7 +572,7 @@ ambiguous
EOF EOF
test_expect_success 'Check ambiguous head and tag refs II (loose)' ' test_expect_success 'Check ambiguous head and tag refs II (loose)' '
git checkout master && git checkout main &&
git tag ambiguous testtag^0 && git tag ambiguous testtag^0 &&
git branch ambiguous testtag^0 && git branch ambiguous testtag^0 &&
git for-each-ref --format "%(refname:short)" refs/heads/ambiguous refs/tags/ambiguous >actual && git for-each-ref --format "%(refname:short)" refs/heads/ambiguous refs/tags/ambiguous >actual &&
@ -705,8 +706,8 @@ body contents
$sig" $sig"
test_expect_success 'set up refs pointing to tree and blob' ' test_expect_success 'set up refs pointing to tree and blob' '
git update-ref refs/mytrees/first refs/heads/master^{tree} && git update-ref refs/mytrees/first refs/heads/main^{tree} &&
git update-ref refs/myblobs/first refs/heads/master:one git update-ref refs/myblobs/first refs/heads/main:one
' '
test_atom refs/mytrees/first subject "" test_atom refs/mytrees/first subject ""
@ -778,7 +779,7 @@ test_expect_success 'equivalent sorts fall back on refname' '
' '
test_expect_success 'do not dereference NULL upon %(HEAD) on unborn branch' ' test_expect_success 'do not dereference NULL upon %(HEAD) on unborn branch' '
test_when_finished "git checkout master" && test_when_finished "git checkout main" &&
git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual && git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
sed -e "s/^\* / /" actual >expect && sed -e "s/^\* / /" actual >expect &&
git checkout --orphan orphaned-branch && git checkout --orphan orphaned-branch &&
@ -815,9 +816,9 @@ test_expect_success '%(trailers:unfold) unfolds trailers' '
unfold <trailers unfold <trailers
echo echo
} >expect && } >expect &&
git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual && git for-each-ref --format="%(trailers:unfold)" refs/heads/main >actual &&
test_cmp expect actual && test_cmp expect actual &&
git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual && git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -826,9 +827,9 @@ test_expect_success '%(trailers:only) shows only "key: value" trailers' '
grep -v patch.description <trailers && grep -v patch.description <trailers &&
echo echo
} >expect && } >expect &&
git for-each-ref --format="%(trailers:only)" refs/heads/master >actual && git for-each-ref --format="%(trailers:only)" refs/heads/main >actual &&
test_cmp expect actual && test_cmp expect actual &&
git for-each-ref --format="%(contents:trailers:only)" refs/heads/master >actual && git for-each-ref --format="%(contents:trailers:only)" refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -837,13 +838,13 @@ test_expect_success '%(trailers:only) and %(trailers:unfold) work together' '
grep -v patch.description <trailers | unfold && grep -v patch.description <trailers | unfold &&
echo echo
} >expect && } >expect &&
git for-each-ref --format="%(trailers:only,unfold)" refs/heads/master >actual && git for-each-ref --format="%(trailers:only,unfold)" refs/heads/main >actual &&
test_cmp expect actual && test_cmp expect actual &&
git for-each-ref --format="%(trailers:unfold,only)" refs/heads/master >actual && git for-each-ref --format="%(trailers:unfold,only)" refs/heads/main >actual &&
test_cmp actual actual && test_cmp actual actual &&
git for-each-ref --format="%(contents:trailers:only,unfold)" refs/heads/master >actual && git for-each-ref --format="%(contents:trailers:only,unfold)" refs/heads/main >actual &&
test_cmp expect actual && test_cmp expect actual &&
git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/master >actual && git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/main >actual &&
test_cmp actual actual test_cmp actual actual
' '
@ -867,7 +868,7 @@ test_expect_success 'if arguments, %(contents:trailers) shows error if colon is
' '
test_expect_success 'basic atom: head contents:trailers' ' test_expect_success 'basic atom: head contents:trailers' '
git for-each-ref --format="%(contents:trailers)" refs/heads/master >actual && git for-each-ref --format="%(contents:trailers)" refs/heads/main >actual &&
sanitize_pgp <actual >actual.clean && sanitize_pgp <actual >actual.clean &&
# git for-each-ref ends with a blank line # git for-each-ref ends with a blank line
cat >expect <<-EOF && cat >expect <<-EOF &&
@ -896,16 +897,16 @@ test_expect_success 'trailer parsing not fooled by --- line' '
echo "trailer: right" && echo "trailer: right" &&
echo echo
} >expect && } >expect &&
git for-each-ref --format="%(trailers)" refs/heads/master >actual && git for-each-ref --format="%(trailers)" refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'Add symbolic ref for the following tests' ' test_expect_success 'Add symbolic ref for the following tests' '
git symbolic-ref refs/heads/sym refs/heads/master git symbolic-ref refs/heads/sym refs/heads/main
' '
cat >expected <<EOF cat >expected <<EOF
refs/heads/master refs/heads/main
EOF EOF
test_expect_success 'Verify usage of %(symref) atom' ' test_expect_success 'Verify usage of %(symref) atom' '
@ -914,7 +915,7 @@ test_expect_success 'Verify usage of %(symref) atom' '
' '
cat >expected <<EOF cat >expected <<EOF
heads/master heads/main
EOF EOF
test_expect_success 'Verify usage of %(symref:short) atom' ' test_expect_success 'Verify usage of %(symref:short) atom' '
@ -923,8 +924,8 @@ test_expect_success 'Verify usage of %(symref:short) atom' '
' '
cat >expected <<EOF cat >expected <<EOF
master main
heads/master heads/main
EOF EOF
test_expect_success 'Verify usage of %(symref:lstrip) atom' ' test_expect_success 'Verify usage of %(symref:lstrip) atom' '
@ -953,22 +954,23 @@ test_expect_success ':remotename and :remoteref' '
( (
cd remote-tests && cd remote-tests &&
test_commit initial && test_commit initial &&
git branch -M main &&
git remote add from fifth.coffee:blub && git remote add from fifth.coffee:blub &&
git config branch.master.remote from && git config branch.main.remote from &&
git config branch.master.merge refs/heads/stable && git config branch.main.merge refs/heads/stable &&
git remote add to southridge.audio:repo && git remote add to southridge.audio:repo &&
git config remote.to.push "refs/heads/*:refs/heads/pushed/*" && git config remote.to.push "refs/heads/*:refs/heads/pushed/*" &&
git config branch.master.pushRemote to && git config branch.main.pushRemote to &&
for pair in "%(upstream)=refs/remotes/from/stable" \ for pair in "%(upstream)=refs/remotes/from/stable" \
"%(upstream:remotename)=from" \ "%(upstream:remotename)=from" \
"%(upstream:remoteref)=refs/heads/stable" \ "%(upstream:remoteref)=refs/heads/stable" \
"%(push)=refs/remotes/to/pushed/master" \ "%(push)=refs/remotes/to/pushed/main" \
"%(push:remotename)=to" \ "%(push:remotename)=to" \
"%(push:remoteref)=refs/heads/pushed/master" "%(push:remoteref)=refs/heads/pushed/main"
do do
echo "${pair#*=}" >expect && echo "${pair#*=}" >expect &&
git for-each-ref --format="${pair%=*}" \ git for-each-ref --format="${pair%=*}" \
refs/heads/master >actual && refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
done && done &&
git branch push-simple && git branch push-simple &&
@ -981,12 +983,12 @@ test_expect_success ':remotename and :remoteref' '
' '
test_expect_success 'for-each-ref --ignore-case ignores case' ' test_expect_success 'for-each-ref --ignore-case ignores case' '
git for-each-ref --format="%(refname)" refs/heads/MASTER >actual && git for-each-ref --format="%(refname)" refs/heads/MAIN >actual &&
test_must_be_empty actual && test_must_be_empty actual &&
echo refs/heads/master >expect && echo refs/heads/main >expect &&
git for-each-ref --format="%(refname)" --ignore-case \ git for-each-ref --format="%(refname)" --ignore-case \
refs/heads/MASTER >actual && refs/heads/MAIN >actual &&
test_cmp expect actual test_cmp expect actual
' '