File tree Expand file tree Collapse file tree 8 files changed +20
-20
lines changed Expand file tree Collapse file tree 8 files changed +20
-20
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ clone-foo-and-bar
1010
1111(
1212 mkdir -p " $OWNER /empty"
13- git init --initial-branch=$ DEFAULTBRANCH " $OWNER /empty"
13+ git init --initial-branch=" ${ DEFAULTBRANCH} " " $OWNER /empty"
1414)
1515
1616# Test that the repos look ok:
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ gitrepo=$OWNER/init/doc/.gitrepo
1515 cd " $OWNER /init"
1616 git config user.email " ini@ini"
1717 git config user.name " IniUser"
18- git config init.defaultBranch $ DEFAULTBRANCH
18+ git config init.defaultBranch " ${ DEFAULTBRANCH} "
1919 git subrepo init doc
2020) > /dev/null
2121
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ output=$(
2424 cd " $OWNER /init"
2525 git config user.email " ini@ini"
2626 git config user.name " IniUser"
27- git config init.defaultBranch $ DEFAULTBRANCH
27+ git config init.defaultBranch " ${ DEFAULTBRANCH} "
2828 git subrepo init doc
2929)
3030
@@ -53,7 +53,7 @@ git clone "$UPSTREAM/init" "$OWNER/init" &>/dev/null
5353 cd " $OWNER /init"
5454 git config user.email " ini@ini"
5555 git config user.name " IniUser"
56- git config init.defaultBranch $ DEFAULTBRANCH
56+ git config init.defaultBranch " ${ DEFAULTBRANCH} "
5757 git subrepo init doc -r
[email protected] :user/repo -b foo -M rebase
5858) > /dev/null
5959
Original file line number Diff line number Diff line change @@ -18,9 +18,9 @@ cd "$TMP"
1818# Make 3 new repos:
1919(
2020 mkdir share main1 main2
21- git init --initial-branch=$ DEFAULTBRANCH share
22- git init --initial-branch=$ DEFAULTBRANCH main1
23- git init --initial-branch=$ DEFAULTBRANCH main2
21+ git init --initial-branch=" ${ DEFAULTBRANCH} " share
22+ git init --initial-branch=" ${ DEFAULTBRANCH} " main1
23+ git init --initial-branch=" ${ DEFAULTBRANCH} " main2
2424) > /dev/null
2525
2626# Add an empty 'readme' to the share repo:
@@ -44,7 +44,7 @@ cd "$TMP"
4444 touch main1
4545 git add main1
4646 git commit -m " Initial main1"
47- git subrepo clone ../share share -b " $DEFAULTBRANCH "
47+ git subrepo clone ../share share -b " ${ DEFAULTBRANCH} "
4848) > /dev/null
4949
5050# `subrepo clone` the share repo into main2:
@@ -55,7 +55,7 @@ cd "$TMP"
5555 touch main2
5656 git add main2
5757 git commit -m " Initial main2"
58- git subrepo clone ../share share -b " $DEFAULTBRANCH "
58+ git subrepo clone ../share share -b " ${ DEFAULTBRANCH} "
5959) > /dev/null
6060
6161
Original file line number Diff line number Diff line change @@ -12,8 +12,8 @@ use Test::More
1212 # Make two new repos
1313 (
1414 mkdir host sub
15- git init --initial-branch=$ DEFAULTBRANCH host
16- git init --initial-branch=$ DEFAULTBRANCH sub
15+ git init --initial-branch=" ${ DEFAULTBRANCH} " host
16+ git init --initial-branch=" ${ DEFAULTBRANCH} " sub
1717 ) > /dev/null
1818
1919 # Initialize host repo
@@ -49,7 +49,7 @@ use Test::More
4949 touch feature
5050 git add feature
5151 git commit -m " feature added"
52- git checkout " $DEFAULTBRANCH "
52+ git checkout " ${ DEFAULTBRANCH} "
5353 ) & > /dev/null
5454
5555 # Commit directly to subrepo
Original file line number Diff line number Diff line change @@ -11,8 +11,8 @@ use Test::More
1111 # Make two new repos
1212 (
1313 mkdir host sub
14- git init --initial-branch=$ DEFAULTBRANCH host
15- git init --initial-branch=$ DEFAULTBRANCH sub
14+ git init --initial-branch=" ${ DEFAULTBRANCH} " host
15+ git init --initial-branch=" ${ DEFAULTBRANCH} " sub
1616 ) > /dev/null
1717
1818 # Initialize host repo
@@ -90,7 +90,7 @@ use Test::More
9090 # expected: successful push without conflicts
9191 is " $(
9292 cd host
93- git subrepo push sub -b " $DEFAULTBRANCH " -u
93+ git subrepo push sub -b " ${ DEFAULTBRANCH} " -u
9494 ) " \
9595 " Subrepo 'sub' pushed to '../sub' ($DEFAULTBRANCH )."
9696
Original file line number Diff line number Diff line change @@ -12,14 +12,14 @@ use Test::More
1212(
1313 mkdir -p " $OWNER /init"
1414 cd " $OWNER /init"
15- git init --initial-branch=$ DEFAULTBRANCH
15+ git init --initial-branch=" ${ DEFAULTBRANCH} "
1616 git config user.name " IniUser"
1717 git config user.email " ini@ini"
1818 mkdir doc
1919 add-new-files doc/FooBar
2020 git subrepo init doc || die
2121 mkdir ../upstream
22- git init --initial-branch=$ DEFAULTBRANCH --bare ../upstream || die
22+ git init --initial-branch=" ${ DEFAULTBRANCH} " --bare ../upstream || die
2323 cd ../upstream
2424 git config user.name " UpsUser"
2525 git config user.email " ups@ups"
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ mkdir -p "$UPSTREAM" "$OWNER" "$COLLAB"
6262cp -r test/repo/{foo,bar,init} " $UPSTREAM /"
6363
6464DEFAULTBRANCH=$( git config --global --get init.defaultbranch || true )
65- [[ -z $ DEFAULTBRANCH ]] && DEFAULTBRANCH=" master"
65+ [[ -z " ${ DEFAULTBRANCH} " ]] && DEFAULTBRANCH=" master"
6666export DEFAULTBRANCH
6767
6868# ##
@@ -76,15 +76,15 @@ clone-foo-and-bar() {
7676 cd " $OWNER /foo"
7777 git config user.name " FooUser"
7878 git config user.email " foo@foo"
79- git config init.defaultBranch $ DEFAULTBRANCH
79+ git config init.defaultBranch " ${ DEFAULTBRANCH} "
8080 )
8181 # bar will act as the subrepo
8282 git clone " $UPSTREAM /bar" " $OWNER /bar"
8383 (
8484 cd " $OWNER /bar"
8585 git config user.name " BarUser"
8686 git config user.email " bar@bar"
87- git config init.defaultBranch $ DEFAULTBRANCH
87+ git config init.defaultBranch " ${ DEFAULTBRANCH} "
8888 )
8989 ) & > /dev/null || die
9090}
You can’t perform that action at this time.
0 commit comments