]>
Commit | Line | Data |
---|---|---|
88961ef2 LH |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2007 Lars Hjemli | |
4 | # | |
5 | ||
6 | test_description='Basic porcelain support for submodules | |
7 | ||
8 | This test tries to verify basic sanity of the init, update and status | |
47a528ad | 9 | subcommands of git submodule. |
88961ef2 LH |
10 | ' |
11 | ||
12 | . ./test-lib.sh | |
13 | ||
fe454b13 JN |
14 | test_expect_success 'setup - initial commit' ' |
15 | >t && | |
47a528ad NS |
16 | git add t && |
17 | git commit -m "initial commit" && | |
fe454b13 JN |
18 | git branch initial |
19 | ' | |
20 | ||
21 | test_expect_success 'setup - repository in init subdirectory' ' | |
a2d93aea | 22 | mkdir init && |
fe454b13 JN |
23 | ( |
24 | cd init && | |
25 | git init && | |
26 | echo a >a && | |
27 | git add a && | |
28 | git commit -m "submodule commit 1" && | |
29 | git tag -a -m "rev-1" rev-1 | |
30 | ) | |
fe454b13 JN |
31 | ' |
32 | ||
33 | test_expect_success 'setup - commit with gitlink' ' | |
88961ef2 LH |
34 | echo a >a && |
35 | echo z >z && | |
a2d93aea | 36 | git add a init z && |
fe454b13 JN |
37 | git commit -m "super commit 1" |
38 | ' | |
39 | ||
40 | test_expect_success 'setup - hide init subdirectory' ' | |
41 | mv init .subrepo | |
42 | ' | |
43 | ||
a76c944b | 44 | test_expect_success 'setup - repository to add submodules to' ' |
31991b02 ÆAB |
45 | git init addtest && |
46 | git init addtest-ignore | |
a76c944b JN |
47 | ' |
48 | ||
49 | # The 'submodule add' tests need some repository to add as a submodule. | |
dd008b3b JK |
50 | # The trash directory is a good one as any. We need to canonicalize |
51 | # the name, though, as some tests compare it to the absolute path git | |
52 | # generates, which will expand symbolic links. | |
53 | submodurl=$(pwd -P) | |
a76c944b JN |
54 | |
55 | listbranches() { | |
56 | git for-each-ref --format='%(refname)' 'refs/heads/*' | |
57 | } | |
58 | ||
59 | inspect() { | |
60 | dir=$1 && | |
61 | dotdot="${2:-..}" && | |
62 | ||
ac8463d2 | 63 | ( |
a76c944b JN |
64 | cd "$dir" && |
65 | listbranches >"$dotdot/heads" && | |
66 | { git symbolic-ref HEAD || :; } >"$dotdot/head" && | |
ce8b54d6 | 67 | git rev-parse HEAD >"$dotdot/head-sha1" && |
a76c944b JN |
68 | git update-index --refresh && |
69 | git diff-files --exit-code && | |
70 | git clean -n -d -x >"$dotdot/untracked" | |
ac8463d2 | 71 | ) |
a76c944b | 72 | } |
ac8463d2 MG |
73 | |
74 | test_expect_success 'submodule add' ' | |
a76c944b JN |
75 | echo "refs/heads/master" >expect && |
76 | >empty && | |
77 | ||
ac8463d2 MG |
78 | ( |
79 | cd addtest && | |
80 | git submodule add "$submodurl" submod && | |
81 | git submodule init | |
a76c944b JN |
82 | ) && |
83 | ||
84 | rm -f heads head untracked && | |
85 | inspect addtest/submod ../.. && | |
86 | test_cmp expect heads && | |
87 | test_cmp expect head && | |
88 | test_cmp empty untracked | |
ac8463d2 MG |
89 | ' |
90 | ||
d27b876b | 91 | test_expect_success 'submodule add to .gitignored path fails' ' |
31991b02 ÆAB |
92 | ( |
93 | cd addtest-ignore && | |
d27b876b JL |
94 | cat <<-\EOF >expect && |
95 | The following path is ignored by one of your .gitignore files: | |
96 | submod | |
97 | Use -f if you really want to add it. | |
98 | EOF | |
31991b02 ÆAB |
99 | # Does not use test_commit due to the ignore |
100 | echo "*" > .gitignore && | |
101 | git add --force .gitignore && | |
102 | git commit -m"Ignore everything" && | |
d27b876b | 103 | ! git submodule add "$submodurl" submod >actual 2>&1 && |
3a4c3ed7 | 104 | test_i18ncmp expect actual |
d27b876b JL |
105 | ) |
106 | ' | |
31991b02 | 107 | |
d27b876b JL |
108 | test_expect_success 'submodule add to .gitignored path with --force' ' |
109 | ( | |
110 | cd addtest-ignore && | |
111 | git submodule add --force "$submodurl" submod | |
112 | ) | |
31991b02 ÆAB |
113 | ' |
114 | ||
ea10b60c | 115 | test_expect_success 'submodule add --branch' ' |
a76c944b JN |
116 | echo "refs/heads/initial" >expect-head && |
117 | cat <<-\EOF >expect-heads && | |
118 | refs/heads/initial | |
119 | refs/heads/master | |
120 | EOF | |
121 | >empty && | |
122 | ||
ea10b60c BJ |
123 | ( |
124 | cd addtest && | |
125 | git submodule add -b initial "$submodurl" submod-branch && | |
a76c944b JN |
126 | git submodule init |
127 | ) && | |
128 | ||
129 | rm -f heads head untracked && | |
130 | inspect addtest/submod-branch ../.. && | |
131 | test_cmp expect-heads heads && | |
132 | test_cmp expect-head head && | |
133 | test_cmp empty untracked | |
ea10b60c BJ |
134 | ' |
135 | ||
db75ada5 | 136 | test_expect_success 'submodule add with ./ in path' ' |
a76c944b JN |
137 | echo "refs/heads/master" >expect && |
138 | >empty && | |
139 | ||
ac8463d2 MG |
140 | ( |
141 | cd addtest && | |
142 | git submodule add "$submodurl" ././dotsubmod/./frotz/./ && | |
143 | git submodule init | |
a76c944b JN |
144 | ) && |
145 | ||
146 | rm -f heads head untracked && | |
147 | inspect addtest/dotsubmod/frotz ../../.. && | |
148 | test_cmp expect heads && | |
149 | test_cmp expect head && | |
150 | test_cmp empty untracked | |
ac8463d2 MG |
151 | ' |
152 | ||
db75ada5 | 153 | test_expect_success 'submodule add with // in path' ' |
a76c944b JN |
154 | echo "refs/heads/master" >expect && |
155 | >empty && | |
156 | ||
ac8463d2 MG |
157 | ( |
158 | cd addtest && | |
159 | git submodule add "$submodurl" slashslashsubmod///frotz// && | |
160 | git submodule init | |
a76c944b JN |
161 | ) && |
162 | ||
163 | rm -f heads head untracked && | |
164 | inspect addtest/slashslashsubmod/frotz ../../.. && | |
165 | test_cmp expect heads && | |
166 | test_cmp expect head && | |
167 | test_cmp empty untracked | |
ac8463d2 MG |
168 | ' |
169 | ||
db75ada5 | 170 | test_expect_success 'submodule add with /.. in path' ' |
a76c944b JN |
171 | echo "refs/heads/master" >expect && |
172 | >empty && | |
173 | ||
ac8463d2 MG |
174 | ( |
175 | cd addtest && | |
176 | git submodule add "$submodurl" dotdotsubmod/../realsubmod/frotz/.. && | |
177 | git submodule init | |
a76c944b JN |
178 | ) && |
179 | ||
180 | rm -f heads head untracked && | |
181 | inspect addtest/realsubmod ../.. && | |
182 | test_cmp expect heads && | |
183 | test_cmp expect head && | |
184 | test_cmp empty untracked | |
ac8463d2 MG |
185 | ' |
186 | ||
db75ada5 | 187 | test_expect_success 'submodule add with ./, /.. and // in path' ' |
a76c944b JN |
188 | echo "refs/heads/master" >expect && |
189 | >empty && | |
190 | ||
ac8463d2 MG |
191 | ( |
192 | cd addtest && | |
193 | git submodule add "$submodurl" dot/dotslashsubmod/./../..////realsubmod2/a/b/c/d/../../../../frotz//.. && | |
194 | git submodule init | |
a76c944b JN |
195 | ) && |
196 | ||
197 | rm -f heads head untracked && | |
198 | inspect addtest/realsubmod2 ../.. && | |
199 | test_cmp expect heads && | |
200 | test_cmp expect head && | |
201 | test_cmp empty untracked | |
ac8463d2 MG |
202 | ' |
203 | ||
ce8b54d6 JN |
204 | test_expect_success 'setup - add an example entry to .gitmodules' ' |
205 | GIT_CONFIG=.gitmodules \ | |
206 | git config submodule.example.url git://example.com/init.git | |
207 | ' | |
208 | ||
941987a5 | 209 | test_expect_success 'status should fail for unmapped paths' ' |
ce8b54d6 JN |
210 | test_must_fail git submodule status |
211 | ' | |
212 | ||
213 | test_expect_success 'setup - map path in .gitmodules' ' | |
214 | cat <<\EOF >expect && | |
215 | [submodule "example"] | |
216 | url = git://example.com/init.git | |
217 | path = init | |
218 | EOF | |
219 | ||
220 | GIT_CONFIG=.gitmodules git config submodule.example.path init && | |
221 | ||
222 | test_cmp expect .gitmodules | |
88961ef2 LH |
223 | ' |
224 | ||
225 | test_expect_success 'status should only print one line' ' | |
ce8b54d6 JN |
226 | git submodule status >lines && |
227 | test $(wc -l <lines) = 1 | |
228 | ' | |
229 | ||
230 | test_expect_success 'setup - fetch commit name from submodule' ' | |
231 | rev1=$(cd .subrepo && git rev-parse HEAD) && | |
232 | printf "rev1: %s\n" "$rev1" && | |
233 | test -n "$rev1" | |
88961ef2 LH |
234 | ' |
235 | ||
236 | test_expect_success 'status should initially be "missing"' ' | |
ce8b54d6 JN |
237 | git submodule status >lines && |
238 | grep "^-$rev1" lines | |
88961ef2 LH |
239 | ' |
240 | ||
211b7f19 | 241 | test_expect_success 'init should register submodule url in .git/config' ' |
ce8b54d6 JN |
242 | echo git://example.com/init.git >expect && |
243 | ||
47a528ad | 244 | git submodule init && |
ce8b54d6 JN |
245 | git config submodule.example.url >url && |
246 | git config submodule.example.url ./.subrepo && | |
247 | ||
248 | test_cmp expect url | |
211b7f19 LH |
249 | ' |
250 | ||
251 | test_expect_success 'update should fail when path is used by a file' ' | |
ce8b54d6 JN |
252 | echo hello >expect && |
253 | ||
a2d93aea | 254 | echo "hello" >init && |
ce8b54d6 JN |
255 | test_must_fail git submodule update && |
256 | ||
257 | test_cmp expect init | |
88961ef2 LH |
258 | ' |
259 | ||
211b7f19 | 260 | test_expect_success 'update should fail when path is used by a nonempty directory' ' |
ce8b54d6 JN |
261 | echo hello >expect && |
262 | ||
263 | rm -fr init && | |
a2d93aea JH |
264 | mkdir init && |
265 | echo "hello" >init/a && | |
ce8b54d6 JN |
266 | |
267 | test_must_fail git submodule update && | |
268 | ||
269 | test_cmp expect init/a | |
88961ef2 LH |
270 | ' |
271 | ||
211b7f19 | 272 | test_expect_success 'update should work when path is an empty dir' ' |
ce8b54d6 JN |
273 | rm -fr init && |
274 | rm -f head-sha1 && | |
275 | echo "$rev1" >expect && | |
276 | ||
a2d93aea | 277 | mkdir init && |
47a528ad | 278 | git submodule update && |
ce8b54d6 JN |
279 | |
280 | inspect init && | |
281 | test_cmp expect head-sha1 | |
88961ef2 LH |
282 | ' |
283 | ||
211b7f19 | 284 | test_expect_success 'status should be "up-to-date" after update' ' |
ce8b54d6 JN |
285 | git submodule status >list && |
286 | grep "^ $rev1" list | |
88961ef2 LH |
287 | ' |
288 | ||
289 | test_expect_success 'status should be "modified" after submodule commit' ' | |
ce8b54d6 JN |
290 | ( |
291 | cd init && | |
292 | echo b >b && | |
293 | git add b && | |
294 | git commit -m "submodule commit 2" | |
295 | ) && | |
296 | ||
297 | rev2=$(cd init && git rev-parse HEAD) && | |
298 | test -n "$rev2" && | |
299 | git submodule status >list && | |
300 | ||
301 | grep "^+$rev2" list | |
88961ef2 LH |
302 | ' |
303 | ||
304 | test_expect_success 'the --cached sha1 should be rev1' ' | |
ce8b54d6 JN |
305 | git submodule --cached status >list && |
306 | grep "^+$rev1" list | |
88961ef2 LH |
307 | ' |
308 | ||
5701115a | 309 | test_expect_success 'git diff should report the SHA1 of the new submodule commit' ' |
ce8b54d6 JN |
310 | git diff >diff && |
311 | grep "^+Subproject commit $rev2" diff | |
5701115a SV |
312 | ' |
313 | ||
88961ef2 | 314 | test_expect_success 'update should checkout rev1' ' |
ce8b54d6 JN |
315 | rm -f head-sha1 && |
316 | echo "$rev1" >expect && | |
317 | ||
47a528ad | 318 | git submodule update init && |
ce8b54d6 JN |
319 | inspect init && |
320 | ||
321 | test_cmp expect head-sha1 | |
88961ef2 LH |
322 | ' |
323 | ||
324 | test_expect_success 'status should be "up-to-date" after update' ' | |
ce8b54d6 JN |
325 | git submodule status >list && |
326 | grep "^ $rev1" list | |
88961ef2 LH |
327 | ' |
328 | ||
0cf73755 | 329 | test_expect_success 'checkout superproject with subproject already present' ' |
47a528ad NS |
330 | git checkout initial && |
331 | git checkout master | |
0cf73755 SV |
332 | ' |
333 | ||
e06c5a6c | 334 | test_expect_success 'apply submodule diff' ' |
ce8b54d6 JN |
335 | >empty && |
336 | ||
e06c5a6c SV |
337 | git branch second && |
338 | ( | |
a2d93aea | 339 | cd init && |
e06c5a6c SV |
340 | echo s >s && |
341 | git add s && | |
342 | git commit -m "change subproject" | |
343 | ) && | |
a2d93aea | 344 | git update-index --add init && |
47a528ad NS |
345 | git commit -m "change init" && |
346 | git format-patch -1 --stdout >P.diff && | |
e06c5a6c SV |
347 | git checkout second && |
348 | git apply --index P.diff && | |
ce8b54d6 JN |
349 | |
350 | git diff --cached master >staged && | |
351 | test_cmp empty staged | |
e06c5a6c SV |
352 | ' |
353 | ||
be4d2c83 | 354 | test_expect_success 'update --init' ' |
be4d2c83 JS |
355 | mv init init2 && |
356 | git config -f .gitmodules submodule.example.url "$(pwd)/init2" && | |
ce8b54d6 JN |
357 | git config --remove-section submodule.example && |
358 | test_must_fail git config submodule.example.url && | |
359 | ||
be4d2c83 | 360 | git submodule update init > update.out && |
ce8b54d6 | 361 | cat update.out && |
1c2ef66f | 362 | test_i18ngrep "not initialized" update.out && |
ce8b54d6 JN |
363 | ! test -d init/.git && |
364 | ||
be4d2c83 JS |
365 | git submodule update --init init && |
366 | test -d init/.git | |
be4d2c83 JS |
367 | ' |
368 | ||
2ce53f9b JS |
369 | test_expect_success 'do not add files from a submodule' ' |
370 | ||
371 | git reset --hard && | |
372 | test_must_fail git add init/a | |
373 | ||
374 | ' | |
375 | ||
376 | test_expect_success 'gracefully add submodule with a trailing slash' ' | |
377 | ||
378 | git reset --hard && | |
379 | git commit -m "commit subproject" init && | |
380 | (cd init && | |
381 | echo b > a) && | |
382 | git add init/ && | |
383 | git diff --exit-code --cached init && | |
384 | commit=$(cd init && | |
385 | git commit -m update a >/dev/null && | |
386 | git rev-parse HEAD) && | |
387 | git add init/ && | |
388 | test_must_fail git diff --exit-code --cached init && | |
389 | test $commit = $(git ls-files --stage | | |
390 | sed -n "s/^160000 \([^ ]*\).*/\1/p") | |
391 | ||
392 | ' | |
393 | ||
f3670a57 JS |
394 | test_expect_success 'ls-files gracefully handles trailing slash' ' |
395 | ||
396 | test "init" = "$(git ls-files init/)" | |
397 | ||
398 | ' | |
399 | ||
c5e558a8 PC |
400 | test_expect_success 'moving to a commit without submodule does not leave empty dir' ' |
401 | rm -rf init && | |
402 | mkdir init && | |
403 | git reset --hard && | |
404 | git checkout initial && | |
405 | test ! -d init && | |
406 | git checkout second | |
407 | ' | |
408 | ||
496917b7 JS |
409 | test_expect_success 'submodule <invalid-path> warns' ' |
410 | ||
411 | git submodule no-such-submodule 2> output.err && | |
412 | grep "^error: .*no-such-submodule" output.err | |
413 | ||
414 | ' | |
415 | ||
1414e578 JL |
416 | test_expect_success 'add submodules without specifying an explicit path' ' |
417 | mkdir repo && | |
18a82692 JN |
418 | ( |
419 | cd repo && | |
420 | git init && | |
421 | echo r >r && | |
422 | git add r && | |
423 | git commit -m "repo commit 1" | |
fd4ec4f2 | 424 | ) && |
1414e578 | 425 | git clone --bare repo/ bare.git && |
69e7236c JL |
426 | ( |
427 | cd addtest && | |
428 | git submodule add "$submodurl/repo" && | |
429 | git config -f .gitmodules submodule.repo.path repo && | |
430 | git submodule add "$submodurl/bare.git" && | |
431 | git config -f .gitmodules submodule.bare.path bare | |
432 | ) | |
433 | ' | |
434 | ||
435 | test_expect_success 'add should fail when path is used by a file' ' | |
436 | ( | |
437 | cd addtest && | |
438 | touch file && | |
439 | test_must_fail git submodule add "$submodurl/repo" file | |
440 | ) | |
441 | ' | |
442 | ||
443 | test_expect_success 'add should fail when path is used by an existing directory' ' | |
444 | ( | |
445 | cd addtest && | |
446 | mkdir empty-dir && | |
447 | test_must_fail git submodule add "$submodurl/repo" empty-dir | |
448 | ) | |
1414e578 JL |
449 | ' |
450 | ||
4d689320 | 451 | test_expect_success 'use superproject as upstream when path is relative and no url is set there' ' |
8537f0ef JL |
452 | ( |
453 | cd addtest && | |
4d689320 JL |
454 | git submodule add ../repo relative && |
455 | test "$(git config -f .gitmodules submodule.relative.url)" = ../repo && | |
456 | git submodule sync relative && | |
457 | test "$(git config submodule.relative.url)" = "$submodurl/repo" | |
8537f0ef JL |
458 | ) |
459 | ' | |
460 | ||
ea640cc6 TR |
461 | test_expect_success 'set up for relative path tests' ' |
462 | mkdir reltest && | |
463 | ( | |
464 | cd reltest && | |
465 | git init && | |
466 | mkdir sub && | |
467 | ( | |
468 | cd sub && | |
469 | git init && | |
470 | test_commit foo | |
471 | ) && | |
472 | git add sub && | |
473 | git config -f .gitmodules submodule.sub.path sub && | |
474 | git config -f .gitmodules submodule.sub.url ../subrepo && | |
475 | cp .git/config pristine-.git-config | |
476 | ) | |
477 | ' | |
478 | ||
479 | test_expect_success 'relative path works with URL' ' | |
480 | ( | |
481 | cd reltest && | |
482 | cp pristine-.git-config .git/config && | |
483 | git config remote.origin.url ssh://hostname/repo && | |
484 | git submodule init && | |
485 | test "$(git config submodule.sub.url)" = ssh://hostname/subrepo | |
486 | ) | |
487 | ' | |
488 | ||
489 | test_expect_success 'relative path works with user@host:path' ' | |
490 | ( | |
491 | cd reltest && | |
492 | cp pristine-.git-config .git/config && | |
493 | git config remote.origin.url user@host:repo && | |
494 | git submodule init && | |
495 | test "$(git config submodule.sub.url)" = user@host:subrepo | |
496 | ) | |
497 | ' | |
498 | ||
88961ef2 | 499 | test_done |