blob: ab946ec9405deb536ffd7c6fa350bcc8abf3544c (
plain)
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
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
#!/bin/sh
test_description='submodule --cached, --quiet etc. output'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-t3100.sh
setup_sub () {
local d="$1" &&
shift &&
git $@ clone . "$d" &&
git $@ submodule add ./"$d"
}
normalize_status () {
sed -e 's/-g[0-9a-f]*/-gHASH/'
}
test_expect_success 'setup' '
test_commit A &&
test_commit B &&
setup_sub S &&
setup_sub S.D &&
setup_sub S.C &&
setup_sub S.C.D &&
setup_sub X &&
git add S* &&
test_commit C &&
# recursive in X/
git -C X pull &&
GIT_ALLOW_PROTOCOL=file git -C X submodule update --init &&
# dirty
for d in S.D X/S.D
do
echo dirty >"$d"/A.t || return 1
done &&
# commit (for --cached)
for d in S.C* X/S.C*
do
git -C "$d" reset --hard A || return 1
done &&
# dirty
for d in S*.D X/S*.D
do
echo dirty >"$d/C2.t" || return 1
done &&
for ref in A B C
do
# Not different with SHA-1 and SHA-256, just (ab)using
# test_oid_cache as a variable bag to avoid using
# $(git rev-parse ...).
oid=$(git rev-parse $ref) &&
test_oid_cache <<-EOF || return 1
$ref sha1:$oid
$ref sha256:$oid
EOF
done
'
for opts in "" "status"
do
test_expect_success "git submodule $opts" '
sed -e "s/^>//" >expect <<-EOF &&
> $(test_oid B) S (B)
>+$(test_oid A) S.C (A)
>+$(test_oid A) S.C.D (A)
> $(test_oid B) S.D (B)
>+$(test_oid C) X (C)
EOF
git submodule $opts >actual.raw &&
normalize_status <actual.raw >actual &&
test_cmp expect actual
'
done
for opts in \
"status --recursive"
do
test_expect_success "git submodule $opts" '
sed -e "s/^>//" >expect <<-EOF &&
> $(test_oid B) S (B)
>+$(test_oid A) S.C (A)
>+$(test_oid A) S.C.D (A)
> $(test_oid B) S.D (B)
>+$(test_oid C) X (C)
> $(test_oid B) X/S (B)
>+$(test_oid A) X/S.C (A)
>+$(test_oid A) X/S.C.D (A)
> $(test_oid B) X/S.D (B)
> $(test_oid B) X/X (B)
EOF
git submodule $opts >actual.raw &&
normalize_status <actual.raw >actual &&
test_cmp expect actual
'
done
for opts in \
"--quiet" \
"--quiet status" \
"status --quiet"
do
test_expect_success "git submodule $opts" '
git submodule $opts >out &&
test_must_be_empty out
'
done
for opts in \
"--cached" \
"--cached status" \
"status --cached"
do
test_expect_success "git submodule $opts" '
sed -e "s/^>//" >expect <<-EOF &&
> $(test_oid B) S (B)
>+$(test_oid B) S.C (B)
>+$(test_oid B) S.C.D (B)
> $(test_oid B) S.D (B)
>+$(test_oid B) X (B)
EOF
git submodule $opts >actual.raw &&
normalize_status <actual.raw >actual &&
test_cmp expect actual
'
done
for opts in \
"--cached --quiet" \
"--cached --quiet status" \
"--cached status --quiet" \
"--quiet status --cached" \
"status --cached --quiet"
do
test_expect_success "git submodule $opts" '
git submodule $opts >out &&
test_must_be_empty out
'
done
for opts in \
"status --cached --recursive" \
"--cached status --recursive"
do
test_expect_success "git submodule $opts" '
sed -e "s/^>//" >expect <<-EOF &&
> $(test_oid B) S (B)
>+$(test_oid B) S.C (B)
>+$(test_oid B) S.C.D (B)
> $(test_oid B) S.D (B)
>+$(test_oid B) X (B)
> $(test_oid B) X/S (B)
>+$(test_oid B) X/S.C (B)
>+$(test_oid B) X/S.C.D (B)
> $(test_oid B) X/S.D (B)
> $(test_oid B) X/X (B)
EOF
git submodule $opts >actual.raw &&
normalize_status <actual.raw >actual &&
test_cmp expect actual
'
done
test_done
|
