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
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
#!/usr/bin/env bash
set -e
source test/setup
use Test::More
clone-foo-and-bar
subrepo-clone-bar-into-foo
note "Pull - Conflict - Merge ours/theirs - Push"
(
cd "$OWNER/bar"
add-new-files Bar2
git push
) &> /dev/null || die
# shellcheck disable=2034
gitrepo=$OWNER/foo/bar/.gitrepo
# Test foo/bar/.gitrepo file contents:
{
foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD^)
test-gitrepo-field "commit" "$bar_head_commit"
test-gitrepo-field "parent" "$foo_pull_commit"
}
foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD)
(
cd "$OWNER/foo"
git subrepo pull bar
modify-files-ex bar/Bar2
git push
) &> /dev/null || die
(
cd "$OWNER/bar"
modify-files-ex Bar2
git push
) &> /dev/null || die
(
cd "$OWNER/foo"
git subrepo pull bar || {
cd .git/tmp/subrepo/bar
echo "Merged Bar2" > Bar2
git add Bar2
git commit --file ../../../../.git/worktrees/bar/MERGE_MSG
cd ../../../..
git subrepo commit bar
git subrepo clean bar
}
) &> /dev/null || die
test-exists \
"$OWNER/foo/bar/Bar2" \
"$OWNER/bar/Bar2" \
is "$(cat "$OWNER/foo/bar/Bar2")" \
"Merged Bar2" \
"The readme file in the mainrepo is merged"
# Check commit messages
{
foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
like "$foo_new_commit_message" \
"git subrepo commit \(merge\) bar" \
"subrepo pull should have merge message"
}
# Test foo/bar/.gitrepo file contents:
{
bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
test-gitrepo-field "commit" "$bar_head_commit"
test-gitrepo-field "parent" "$foo_pull_commit"
}
(
cd "$OWNER/foo"
git subrepo push bar
) &> /dev/null || die
# Check commit messages
{
foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
like "$foo_new_commit_message" \
"git subrepo push bar" \
"subrepo push should not have merge message"
}
(
cd "$OWNER/bar"
git pull
) &> /dev/null || die
test-exists \
"$OWNER/foo/bar/Bar2" \
"$OWNER/bar/Bar2" \
is "$(cat "$OWNER/foo/bar/Bar2")" \
"Merged Bar2" \
"The readme file in the mainrepo is merged"
is "$(cat "$OWNER/bar/Bar2")" \
"Merged Bar2" \
"The readme file in the subrepo is merged"
done_testing
teardown
|
