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
|
#!/usr/bin/env bash
set -e
source test/setup
use Test::More
clone-foo-and-bar
subrepo-clone-bar-into-foo
(
cd "$OWNER/bar"
add-new-files Bar2
git push
) &> /dev/null || die
# Do the pull and check output, use -m:
{
is "$(
cd "$OWNER/foo"
git subrepo pull -m 'Hello World' bar
)" \
"Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
'subrepo pull command output is correct'
}
# Check -m commit messages
{
foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
like "$foo_new_commit_message" \
"Hello World" \
"subrepo pull commit message"
}
(
cd "$OWNER/bar"
add-new-files Bar3
git push
) &> /dev/null || die
# Do the pull and check output, use -e:
{
is "$(
cd "$OWNER/foo"
GIT_EDITOR='echo cowabunga >' git subrepo pull -e bar
)" \
"Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
'subrepo pull command output is correct'
}
# Check -e commit messages
{
foo_new_commit_message="$(cd "$OWNER/foo"; git log --format=%B -n 1)"
like "$foo_new_commit_message" \
"cowabunga" \
"subrepo pull edit commit message"
}
(
cd "$OWNER/bar"
add-new-files Bar4
git push
) &> /dev/null || die
# Do the pull and check output, use -e and -m:
{
is "$(
cd "$OWNER/foo"
GIT_EDITOR=true git subrepo pull -e -m original bar
)" \
"Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
'subrepo pull command output is correct'
}
# Check -e commit messages
{
foo_new_commit_message="$(cd "$OWNER/foo"; git log --format=%B -n 1)"
like "$foo_new_commit_message" \
"original" \
"subrepo pull edit and message commit message"
}
done_testing
teardown
|
