1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
#!/usr/bin/env bash
set -e
source test/setup
use Test::More
# if [[ $1 == ReRun ]]; then
# set -x
# else
# "$0" ReRun 2>&1 | tee log
# exit 0
# fi
cd "$TMP"
# Make 3 new repos:
(
mkdir share main1 main2
git init share
git init main1
git init main2
) > /dev/null
# Add an empty 'readme' to the share repo:
(
cd share
echo '* text eol=lf' > .gitattributes
touch readme
git add readme .gitattributes
git commit -m "Initial share"
# To push into here later we must not have working copy on master branch:
git checkout -b temp
) &> /dev/null
# `subrepo clone` the share repo into main1:
(
cd main1
touch main1
git add main1
git commit -m "Initial main1"
git subrepo clone ../share share -b "${DEFAULTBRANCH}"
) > /dev/null
# `subrepo clone` the share repo into main2:
(
cd main2
touch main2
git add main2
git commit -m "Initial main2"
git subrepo clone ../share share -b "${DEFAULTBRANCH}"
) > /dev/null
# Make a change to the main1 subrepo and push it:
msg_main1="main1 initial add to subrepo"
( set -x
cd main1
echo "$msg_main1" >> share/readme
git add share/readme
git commit -m "$msg_main1"
git subrepo push share
) &> /dev/null
ok "$(! git:branch-exists "subrepo-push/share")" \
"The subrepo-push/share branch was deleted after push"
# TODO Check the state of refs made
# Pull in the subrepo changes from above into main2.
# Make a local change to the main2 subrepo and push it:
msg_main2="main2 initial add to subrepo"
( set -x
cd main2
git subrepo pull share
echo "$msg_main2" >> share/readme
git add share/readme
git commit -m "$msg_main2"
git subrepo push share
) &> /dev/null || die
# Go back into main1 and pull the subrepo updates:
( set -x
cd main1
git subrepo pull share
) &> /dev/null || die
# The readme file should have both changes:
is "$(cat main1/share/readme)" \
"$msg_main1"$'\n'"$msg_main2" \
"The readme file in the share repo has both subrepo commits"
done_testing
teardown
|
