]>
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 | ||
f6a52799 SB |
14 | test_expect_success 'submodule deinit works on empty repository' ' |
15 | git submodule deinit --all | |
16 | ' | |
17 | ||
fe454b13 JN |
18 | test_expect_success 'setup - initial commit' ' |
19 | >t && | |
47a528ad NS |
20 | git add t && |
21 | git commit -m "initial commit" && | |
fe454b13 JN |
22 | git branch initial |
23 | ' | |
24 | ||
d92028a5 SB |
25 | test_expect_success 'submodule init aborts on missing .gitmodules file' ' |
26 | test_when_finished "git update-index --remove sub" && | |
27 | git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub && | |
28 | # missing the .gitmodules file here | |
29 | test_must_fail git submodule init 2>actual && | |
30 | test_i18ngrep "No url found for submodule path" actual | |
31 | ' | |
32 | ||
08fdbdb1 SB |
33 | test_expect_success 'submodule update aborts on missing .gitmodules file' ' |
34 | test_when_finished "git update-index --remove sub" && | |
35 | git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub && | |
36 | # missing the .gitmodules file here | |
37 | git submodule update sub 2>actual && | |
38 | test_i18ngrep "Submodule path .sub. not initialized" actual | |
39 | ' | |
40 | ||
4b054402 JL |
41 | test_expect_success 'configuration parsing' ' |
42 | test_when_finished "rm -f .gitmodules" && | |
43 | cat >.gitmodules <<-\EOF && | |
44 | [submodule "s"] | |
45 | path | |
46 | ignore | |
47 | EOF | |
48 | test_must_fail git status | |
49 | ' | |
50 | ||
fe454b13 | 51 | test_expect_success 'setup - repository in init subdirectory' ' |
a2d93aea | 52 | mkdir init && |
fe454b13 JN |
53 | ( |
54 | cd init && | |
55 | git init && | |
56 | echo a >a && | |
57 | git add a && | |
58 | git commit -m "submodule commit 1" && | |
59 | git tag -a -m "rev-1" rev-1 | |
60 | ) | |
fe454b13 JN |
61 | ' |
62 | ||
63 | test_expect_success 'setup - commit with gitlink' ' | |
88961ef2 LH |
64 | echo a >a && |
65 | echo z >z && | |
a2d93aea | 66 | git add a init z && |
fe454b13 JN |
67 | git commit -m "super commit 1" |
68 | ' | |
69 | ||
70 | test_expect_success 'setup - hide init subdirectory' ' | |
71 | mv init .subrepo | |
72 | ' | |
73 | ||
a76c944b | 74 | test_expect_success 'setup - repository to add submodules to' ' |
31991b02 ÆAB |
75 | git init addtest && |
76 | git init addtest-ignore | |
a76c944b JN |
77 | ' |
78 | ||
79 | # The 'submodule add' tests need some repository to add as a submodule. | |
dd008b3b JK |
80 | # The trash directory is a good one as any. We need to canonicalize |
81 | # the name, though, as some tests compare it to the absolute path git | |
82 | # generates, which will expand symbolic links. | |
83 | submodurl=$(pwd -P) | |
a76c944b JN |
84 | |
85 | listbranches() { | |
86 | git for-each-ref --format='%(refname)' 'refs/heads/*' | |
87 | } | |
88 | ||
89 | inspect() { | |
90 | dir=$1 && | |
91 | dotdot="${2:-..}" && | |
92 | ||
ac8463d2 | 93 | ( |
a76c944b JN |
94 | cd "$dir" && |
95 | listbranches >"$dotdot/heads" && | |
96 | { git symbolic-ref HEAD || :; } >"$dotdot/head" && | |
ce8b54d6 | 97 | git rev-parse HEAD >"$dotdot/head-sha1" && |
a76c944b JN |
98 | git update-index --refresh && |
99 | git diff-files --exit-code && | |
100 | git clean -n -d -x >"$dotdot/untracked" | |
ac8463d2 | 101 | ) |
a76c944b | 102 | } |
ac8463d2 MG |
103 | |
104 | test_expect_success 'submodule add' ' | |
a76c944b JN |
105 | echo "refs/heads/master" >expect && |
106 | >empty && | |
107 | ||
ac8463d2 MG |
108 | ( |
109 | cd addtest && | |
7e60407f | 110 | git submodule add -q "$submodurl" submod >actual && |
ca8d148d | 111 | test_must_be_empty actual && |
ea115a0d JL |
112 | echo "gitdir: ../.git/modules/submod" >expect && |
113 | test_cmp expect submod/.git && | |
d75219b4 JL |
114 | ( |
115 | cd submod && | |
116 | git config core.worktree >actual && | |
117 | echo "../../../submod" >expect && | |
118 | test_cmp expect actual && | |
119 | rm -f actual expect | |
120 | ) && | |
ac8463d2 | 121 | git submodule init |
a76c944b JN |
122 | ) && |
123 | ||
124 | rm -f heads head untracked && | |
125 | inspect addtest/submod ../.. && | |
126 | test_cmp expect heads && | |
127 | test_cmp expect head && | |
128 | test_cmp empty untracked | |
ac8463d2 MG |
129 | ' |
130 | ||
d27b876b | 131 | test_expect_success 'submodule add to .gitignored path fails' ' |
31991b02 ÆAB |
132 | ( |
133 | cd addtest-ignore && | |
d27b876b JL |
134 | cat <<-\EOF >expect && |
135 | The following path is ignored by one of your .gitignore files: | |
136 | submod | |
137 | Use -f if you really want to add it. | |
138 | EOF | |
31991b02 ÆAB |
139 | # Does not use test_commit due to the ignore |
140 | echo "*" > .gitignore && | |
141 | git add --force .gitignore && | |
142 | git commit -m"Ignore everything" && | |
d27b876b | 143 | ! git submodule add "$submodurl" submod >actual 2>&1 && |
3a4c3ed7 | 144 | test_i18ncmp expect actual |
d27b876b JL |
145 | ) |
146 | ' | |
31991b02 | 147 | |
d27b876b JL |
148 | test_expect_success 'submodule add to .gitignored path with --force' ' |
149 | ( | |
150 | cd addtest-ignore && | |
151 | git submodule add --force "$submodurl" submod | |
152 | ) | |
31991b02 ÆAB |
153 | ' |
154 | ||
ea10b60c | 155 | test_expect_success 'submodule add --branch' ' |
a76c944b JN |
156 | echo "refs/heads/initial" >expect-head && |
157 | cat <<-\EOF >expect-heads && | |
158 | refs/heads/initial | |
159 | refs/heads/master | |
160 | EOF | |
161 | >empty && | |
162 | ||
ea10b60c BJ |
163 | ( |
164 | cd addtest && | |
165 | git submodule add -b initial "$submodurl" submod-branch && | |
b9289227 | 166 | test "initial" = "$(git config -f .gitmodules submodule.submod-branch.branch)" && |
a76c944b JN |
167 | git submodule init |
168 | ) && | |
169 | ||
170 | rm -f heads head untracked && | |
171 | inspect addtest/submod-branch ../.. && | |
172 | test_cmp expect-heads heads && | |
173 | test_cmp expect-head head && | |
174 | test_cmp empty untracked | |
ea10b60c BJ |
175 | ' |
176 | ||
db75ada5 | 177 | test_expect_success 'submodule add with ./ in path' ' |
a76c944b JN |
178 | echo "refs/heads/master" >expect && |
179 | >empty && | |
180 | ||
ac8463d2 MG |
181 | ( |
182 | cd addtest && | |
183 | git submodule add "$submodurl" ././dotsubmod/./frotz/./ && | |
184 | git submodule init | |
a76c944b JN |
185 | ) && |
186 | ||
187 | rm -f heads head untracked && | |
188 | inspect addtest/dotsubmod/frotz ../../.. && | |
189 | test_cmp expect heads && | |
190 | test_cmp expect head && | |
191 | test_cmp empty untracked | |
ac8463d2 MG |
192 | ' |
193 | ||
8196e728 PS |
194 | test_expect_success 'submodule add with /././ in path' ' |
195 | echo "refs/heads/master" >expect && | |
196 | >empty && | |
197 | ||
198 | ( | |
199 | cd addtest && | |
200 | git submodule add "$submodurl" dotslashdotsubmod/././frotz/./ && | |
201 | git submodule init | |
202 | ) && | |
203 | ||
204 | rm -f heads head untracked && | |
205 | inspect addtest/dotslashdotsubmod/frotz ../../.. && | |
206 | test_cmp expect heads && | |
207 | test_cmp expect head && | |
208 | test_cmp empty untracked | |
209 | ' | |
ac8463d2 | 210 | |
db75ada5 | 211 | test_expect_success 'submodule add with // in path' ' |
a76c944b JN |
212 | echo "refs/heads/master" >expect && |
213 | >empty && | |
214 | ||
ac8463d2 MG |
215 | ( |
216 | cd addtest && | |
217 | git submodule add "$submodurl" slashslashsubmod///frotz// && | |
218 | git submodule init | |
a76c944b JN |
219 | ) && |
220 | ||
221 | rm -f heads head untracked && | |
222 | inspect addtest/slashslashsubmod/frotz ../../.. && | |
223 | test_cmp expect heads && | |
224 | test_cmp expect head && | |
225 | test_cmp empty untracked | |
ac8463d2 MG |
226 | ' |
227 | ||
db75ada5 | 228 | test_expect_success 'submodule add with /.. in path' ' |
a76c944b JN |
229 | echo "refs/heads/master" >expect && |
230 | >empty && | |
231 | ||
ac8463d2 MG |
232 | ( |
233 | cd addtest && | |
234 | git submodule add "$submodurl" dotdotsubmod/../realsubmod/frotz/.. && | |
235 | git submodule init | |
a76c944b JN |
236 | ) && |
237 | ||
238 | rm -f heads head untracked && | |
239 | inspect addtest/realsubmod ../.. && | |
240 | test_cmp expect heads && | |
241 | test_cmp expect head && | |
242 | test_cmp empty untracked | |
ac8463d2 MG |
243 | ' |
244 | ||
db75ada5 | 245 | test_expect_success 'submodule add with ./, /.. and // in path' ' |
a76c944b JN |
246 | echo "refs/heads/master" >expect && |
247 | >empty && | |
248 | ||
ac8463d2 MG |
249 | ( |
250 | cd addtest && | |
251 | git submodule add "$submodurl" dot/dotslashsubmod/./../..////realsubmod2/a/b/c/d/../../../../frotz//.. && | |
252 | git submodule init | |
a76c944b JN |
253 | ) && |
254 | ||
255 | rm -f heads head untracked && | |
256 | inspect addtest/realsubmod2 ../.. && | |
257 | test_cmp expect heads && | |
258 | test_cmp expect head && | |
259 | test_cmp empty untracked | |
ac8463d2 MG |
260 | ' |
261 | ||
091a6eb0 JK |
262 | test_expect_success 'submodule add in subdirectory' ' |
263 | echo "refs/heads/master" >expect && | |
264 | >empty && | |
265 | ||
266 | mkdir addtest/sub && | |
267 | ( | |
268 | cd addtest/sub && | |
269 | git submodule add "$submodurl" ../realsubmod3 && | |
270 | git submodule init | |
271 | ) && | |
272 | ||
273 | rm -f heads head untracked && | |
274 | inspect addtest/realsubmod3 ../.. && | |
275 | test_cmp expect heads && | |
276 | test_cmp expect head && | |
277 | test_cmp empty untracked | |
278 | ' | |
279 | ||
280 | test_expect_success 'submodule add in subdirectory with relative path should fail' ' | |
281 | ( | |
282 | cd addtest/sub && | |
283 | test_must_fail git submodule add ../../ submod3 2>../../output.err | |
284 | ) && | |
285 | test_i18ngrep toplevel output.err | |
286 | ' | |
287 | ||
ce8b54d6 | 288 | test_expect_success 'setup - add an example entry to .gitmodules' ' |
f7e87141 | 289 | git config --file=.gitmodules submodule.example.url git://example.com/init.git |
ce8b54d6 JN |
290 | ' |
291 | ||
941987a5 | 292 | test_expect_success 'status should fail for unmapped paths' ' |
ce8b54d6 JN |
293 | test_must_fail git submodule status |
294 | ' | |
295 | ||
296 | test_expect_success 'setup - map path in .gitmodules' ' | |
297 | cat <<\EOF >expect && | |
298 | [submodule "example"] | |
299 | url = git://example.com/init.git | |
300 | path = init | |
301 | EOF | |
302 | ||
f7e87141 | 303 | git config --file=.gitmodules submodule.example.path init && |
ce8b54d6 JN |
304 | |
305 | test_cmp expect .gitmodules | |
88961ef2 LH |
306 | ' |
307 | ||
308 | test_expect_success 'status should only print one line' ' | |
ce8b54d6 | 309 | git submodule status >lines && |
3fb0459b | 310 | test_line_count = 1 lines |
ce8b54d6 JN |
311 | ' |
312 | ||
313 | test_expect_success 'setup - fetch commit name from submodule' ' | |
314 | rev1=$(cd .subrepo && git rev-parse HEAD) && | |
315 | printf "rev1: %s\n" "$rev1" && | |
316 | test -n "$rev1" | |
88961ef2 LH |
317 | ' |
318 | ||
319 | test_expect_success 'status should initially be "missing"' ' | |
ce8b54d6 JN |
320 | git submodule status >lines && |
321 | grep "^-$rev1" lines | |
88961ef2 LH |
322 | ' |
323 | ||
211b7f19 | 324 | test_expect_success 'init should register submodule url in .git/config' ' |
ce8b54d6 JN |
325 | echo git://example.com/init.git >expect && |
326 | ||
47a528ad | 327 | git submodule init && |
ce8b54d6 JN |
328 | git config submodule.example.url >url && |
329 | git config submodule.example.url ./.subrepo && | |
330 | ||
331 | test_cmp expect url | |
211b7f19 LH |
332 | ' |
333 | ||
be9d0a3a HV |
334 | test_failure_with_unknown_submodule () { |
335 | test_must_fail git submodule $1 no-such-submodule 2>output.err && | |
336 | grep "^error: .*no-such-submodule" output.err | |
337 | } | |
338 | ||
339 | test_expect_success 'init should fail with unknown submodule' ' | |
340 | test_failure_with_unknown_submodule init | |
341 | ' | |
342 | ||
343 | test_expect_success 'update should fail with unknown submodule' ' | |
344 | test_failure_with_unknown_submodule update | |
345 | ' | |
346 | ||
347 | test_expect_success 'status should fail with unknown submodule' ' | |
348 | test_failure_with_unknown_submodule status | |
349 | ' | |
350 | ||
351 | test_expect_success 'sync should fail with unknown submodule' ' | |
352 | test_failure_with_unknown_submodule sync | |
353 | ' | |
354 | ||
211b7f19 | 355 | test_expect_success 'update should fail when path is used by a file' ' |
ce8b54d6 JN |
356 | echo hello >expect && |
357 | ||
a2d93aea | 358 | echo "hello" >init && |
ce8b54d6 JN |
359 | test_must_fail git submodule update && |
360 | ||
361 | test_cmp expect init | |
88961ef2 LH |
362 | ' |
363 | ||
211b7f19 | 364 | test_expect_success 'update should fail when path is used by a nonempty directory' ' |
ce8b54d6 JN |
365 | echo hello >expect && |
366 | ||
367 | rm -fr init && | |
a2d93aea JH |
368 | mkdir init && |
369 | echo "hello" >init/a && | |
ce8b54d6 JN |
370 | |
371 | test_must_fail git submodule update && | |
372 | ||
373 | test_cmp expect init/a | |
88961ef2 LH |
374 | ' |
375 | ||
211b7f19 | 376 | test_expect_success 'update should work when path is an empty dir' ' |
ce8b54d6 JN |
377 | rm -fr init && |
378 | rm -f head-sha1 && | |
379 | echo "$rev1" >expect && | |
380 | ||
a2d93aea | 381 | mkdir init && |
7e60407f | 382 | git submodule update -q >update.out && |
ca8d148d | 383 | test_must_be_empty update.out && |
ce8b54d6 JN |
384 | |
385 | inspect init && | |
386 | test_cmp expect head-sha1 | |
88961ef2 LH |
387 | ' |
388 | ||
211b7f19 | 389 | test_expect_success 'status should be "up-to-date" after update' ' |
ce8b54d6 JN |
390 | git submodule status >list && |
391 | grep "^ $rev1" list | |
88961ef2 LH |
392 | ' |
393 | ||
091a6eb0 JK |
394 | test_expect_success 'status "up-to-date" from subdirectory' ' |
395 | mkdir -p sub && | |
396 | ( | |
397 | cd sub && | |
398 | git submodule status >../list | |
399 | ) && | |
400 | grep "^ $rev1" list && | |
401 | grep "\\.\\./init" list | |
402 | ' | |
403 | ||
404 | test_expect_success 'status "up-to-date" from subdirectory with path' ' | |
405 | mkdir -p sub && | |
406 | ( | |
407 | cd sub && | |
408 | git submodule status ../init >../list | |
409 | ) && | |
410 | grep "^ $rev1" list && | |
411 | grep "\\.\\./init" list | |
412 | ' | |
413 | ||
88961ef2 | 414 | test_expect_success 'status should be "modified" after submodule commit' ' |
ce8b54d6 JN |
415 | ( |
416 | cd init && | |
417 | echo b >b && | |
418 | git add b && | |
419 | git commit -m "submodule commit 2" | |
420 | ) && | |
421 | ||
422 | rev2=$(cd init && git rev-parse HEAD) && | |
423 | test -n "$rev2" && | |
424 | git submodule status >list && | |
425 | ||
426 | grep "^+$rev2" list | |
88961ef2 LH |
427 | ' |
428 | ||
429 | test_expect_success 'the --cached sha1 should be rev1' ' | |
ce8b54d6 JN |
430 | git submodule --cached status >list && |
431 | grep "^+$rev1" list | |
88961ef2 LH |
432 | ' |
433 | ||
5701115a | 434 | test_expect_success 'git diff should report the SHA1 of the new submodule commit' ' |
ce8b54d6 JN |
435 | git diff >diff && |
436 | grep "^+Subproject commit $rev2" diff | |
5701115a SV |
437 | ' |
438 | ||
88961ef2 | 439 | test_expect_success 'update should checkout rev1' ' |
ce8b54d6 JN |
440 | rm -f head-sha1 && |
441 | echo "$rev1" >expect && | |
442 | ||
47a528ad | 443 | git submodule update init && |
ce8b54d6 JN |
444 | inspect init && |
445 | ||
446 | test_cmp expect head-sha1 | |
88961ef2 LH |
447 | ' |
448 | ||
449 | test_expect_success 'status should be "up-to-date" after update' ' | |
ce8b54d6 JN |
450 | git submodule status >list && |
451 | grep "^ $rev1" list | |
88961ef2 LH |
452 | ' |
453 | ||
0cf73755 | 454 | test_expect_success 'checkout superproject with subproject already present' ' |
47a528ad NS |
455 | git checkout initial && |
456 | git checkout master | |
0cf73755 SV |
457 | ' |
458 | ||
e06c5a6c | 459 | test_expect_success 'apply submodule diff' ' |
ce8b54d6 JN |
460 | >empty && |
461 | ||
e06c5a6c SV |
462 | git branch second && |
463 | ( | |
a2d93aea | 464 | cd init && |
e06c5a6c SV |
465 | echo s >s && |
466 | git add s && | |
467 | git commit -m "change subproject" | |
468 | ) && | |
a2d93aea | 469 | git update-index --add init && |
47a528ad NS |
470 | git commit -m "change init" && |
471 | git format-patch -1 --stdout >P.diff && | |
e06c5a6c SV |
472 | git checkout second && |
473 | git apply --index P.diff && | |
ce8b54d6 JN |
474 | |
475 | git diff --cached master >staged && | |
476 | test_cmp empty staged | |
e06c5a6c SV |
477 | ' |
478 | ||
be4d2c83 | 479 | test_expect_success 'update --init' ' |
be4d2c83 JS |
480 | mv init init2 && |
481 | git config -f .gitmodules submodule.example.url "$(pwd)/init2" && | |
ce8b54d6 JN |
482 | git config --remove-section submodule.example && |
483 | test_must_fail git config submodule.example.url && | |
484 | ||
8c6b5491 | 485 | git submodule update init 2> update.out && |
ce8b54d6 | 486 | cat update.out && |
1c2ef66f | 487 | test_i18ngrep "not initialized" update.out && |
abc06822 | 488 | test_must_fail git rev-parse --resolve-git-dir init/.git && |
ce8b54d6 | 489 | |
be4d2c83 | 490 | git submodule update --init init && |
abc06822 | 491 | git rev-parse --resolve-git-dir init/.git |
be4d2c83 JS |
492 | ' |
493 | ||
091a6eb0 JK |
494 | test_expect_success 'update --init from subdirectory' ' |
495 | mv init init2 && | |
496 | git config -f .gitmodules submodule.example.url "$(pwd)/init2" && | |
497 | git config --remove-section submodule.example && | |
498 | test_must_fail git config submodule.example.url && | |
499 | ||
500 | mkdir -p sub && | |
501 | ( | |
502 | cd sub && | |
8c6b5491 | 503 | git submodule update ../init 2>update.out && |
091a6eb0 JK |
504 | cat update.out && |
505 | test_i18ngrep "not initialized" update.out && | |
506 | test_must_fail git rev-parse --resolve-git-dir ../init/.git && | |
507 | ||
508 | git submodule update --init ../init | |
509 | ) && | |
510 | git rev-parse --resolve-git-dir init/.git | |
511 | ' | |
512 | ||
2ce53f9b JS |
513 | test_expect_success 'do not add files from a submodule' ' |
514 | ||
515 | git reset --hard && | |
516 | test_must_fail git add init/a | |
517 | ||
518 | ' | |
519 | ||
2c63d6eb | 520 | test_expect_success 'gracefully add/reset submodule with a trailing slash' ' |
2ce53f9b JS |
521 | |
522 | git reset --hard && | |
523 | git commit -m "commit subproject" init && | |
524 | (cd init && | |
525 | echo b > a) && | |
526 | git add init/ && | |
527 | git diff --exit-code --cached init && | |
528 | commit=$(cd init && | |
529 | git commit -m update a >/dev/null && | |
530 | git rev-parse HEAD) && | |
531 | git add init/ && | |
532 | test_must_fail git diff --exit-code --cached init && | |
533 | test $commit = $(git ls-files --stage | | |
2c63d6eb JK |
534 | sed -n "s/^160000 \([^ ]*\).*/\1/p") && |
535 | git reset init/ && | |
536 | git diff --exit-code --cached init | |
2ce53f9b JS |
537 | |
538 | ' | |
539 | ||
f3670a57 JS |
540 | test_expect_success 'ls-files gracefully handles trailing slash' ' |
541 | ||
542 | test "init" = "$(git ls-files init/)" | |
543 | ||
544 | ' | |
545 | ||
c5e558a8 PC |
546 | test_expect_success 'moving to a commit without submodule does not leave empty dir' ' |
547 | rm -rf init && | |
548 | mkdir init && | |
549 | git reset --hard && | |
550 | git checkout initial && | |
551 | test ! -d init && | |
552 | git checkout second | |
553 | ' | |
554 | ||
af9c9f97 RR |
555 | test_expect_success 'submodule <invalid-subcommand> fails' ' |
556 | test_must_fail git submodule no-such-subcommand | |
496917b7 JS |
557 | ' |
558 | ||
1414e578 JL |
559 | test_expect_success 'add submodules without specifying an explicit path' ' |
560 | mkdir repo && | |
18a82692 JN |
561 | ( |
562 | cd repo && | |
563 | git init && | |
564 | echo r >r && | |
565 | git add r && | |
566 | git commit -m "repo commit 1" | |
fd4ec4f2 | 567 | ) && |
1414e578 | 568 | git clone --bare repo/ bare.git && |
69e7236c JL |
569 | ( |
570 | cd addtest && | |
571 | git submodule add "$submodurl/repo" && | |
572 | git config -f .gitmodules submodule.repo.path repo && | |
573 | git submodule add "$submodurl/bare.git" && | |
574 | git config -f .gitmodules submodule.bare.path bare | |
575 | ) | |
576 | ' | |
577 | ||
578 | test_expect_success 'add should fail when path is used by a file' ' | |
579 | ( | |
580 | cd addtest && | |
581 | touch file && | |
582 | test_must_fail git submodule add "$submodurl/repo" file | |
583 | ) | |
584 | ' | |
585 | ||
586 | test_expect_success 'add should fail when path is used by an existing directory' ' | |
587 | ( | |
588 | cd addtest && | |
589 | mkdir empty-dir && | |
590 | test_must_fail git submodule add "$submodurl/repo" empty-dir | |
591 | ) | |
1414e578 JL |
592 | ' |
593 | ||
4d689320 | 594 | test_expect_success 'use superproject as upstream when path is relative and no url is set there' ' |
8537f0ef JL |
595 | ( |
596 | cd addtest && | |
4d689320 JL |
597 | git submodule add ../repo relative && |
598 | test "$(git config -f .gitmodules submodule.relative.url)" = ../repo && | |
599 | git submodule sync relative && | |
600 | test "$(git config submodule.relative.url)" = "$submodurl/repo" | |
8537f0ef JL |
601 | ) |
602 | ' | |
603 | ||
ea640cc6 TR |
604 | test_expect_success 'set up for relative path tests' ' |
605 | mkdir reltest && | |
606 | ( | |
607 | cd reltest && | |
608 | git init && | |
609 | mkdir sub && | |
610 | ( | |
611 | cd sub && | |
612 | git init && | |
613 | test_commit foo | |
614 | ) && | |
615 | git add sub && | |
616 | git config -f .gitmodules submodule.sub.path sub && | |
617 | git config -f .gitmodules submodule.sub.url ../subrepo && | |
712693e8 JS |
618 | cp .git/config pristine-.git-config && |
619 | cp .gitmodules pristine-.gitmodules | |
ea640cc6 TR |
620 | ) |
621 | ' | |
622 | ||
712693e8 | 623 | test_expect_success '../subrepo works with URL - ssh://hostname/repo' ' |
ea640cc6 TR |
624 | ( |
625 | cd reltest && | |
626 | cp pristine-.git-config .git/config && | |
712693e8 | 627 | cp pristine-.gitmodules .gitmodules && |
ea640cc6 TR |
628 | git config remote.origin.url ssh://hostname/repo && |
629 | git submodule init && | |
630 | test "$(git config submodule.sub.url)" = ssh://hostname/subrepo | |
631 | ) | |
632 | ' | |
633 | ||
712693e8 JS |
634 | test_expect_success '../subrepo works with port-qualified URL - ssh://hostname:22/repo' ' |
635 | ( | |
636 | cd reltest && | |
637 | cp pristine-.git-config .git/config && | |
638 | cp pristine-.gitmodules .gitmodules && | |
639 | git config remote.origin.url ssh://hostname:22/repo && | |
640 | git submodule init && | |
641 | test "$(git config submodule.sub.url)" = ssh://hostname:22/subrepo | |
642 | ) | |
643 | ' | |
644 | ||
c517e73d JS |
645 | # About the choice of the path in the next test: |
646 | # - double-slash side-steps path mangling issues on Windows | |
647 | # - it is still an absolute local path | |
648 | # - there cannot be a server with a blank in its name just in case the | |
649 | # path is used erroneously to access a //server/share style path | |
650 | test_expect_success '../subrepo path works with local path - //somewhere else/repo' ' | |
712693e8 JS |
651 | ( |
652 | cd reltest && | |
653 | cp pristine-.git-config .git/config && | |
654 | cp pristine-.gitmodules .gitmodules && | |
c517e73d | 655 | git config remote.origin.url "//somewhere else/repo" && |
712693e8 | 656 | git submodule init && |
c517e73d | 657 | test "$(git config submodule.sub.url)" = "//somewhere else/subrepo" |
712693e8 JS |
658 | ) |
659 | ' | |
660 | ||
661 | test_expect_success '../subrepo works with file URL - file:///tmp/repo' ' | |
662 | ( | |
663 | cd reltest && | |
664 | cp pristine-.git-config .git/config && | |
665 | cp pristine-.gitmodules .gitmodules && | |
666 | git config remote.origin.url file:///tmp/repo && | |
667 | git submodule init && | |
668 | test "$(git config submodule.sub.url)" = file:///tmp/subrepo | |
669 | ) | |
670 | ' | |
671 | ||
672 | test_expect_success '../subrepo works with helper URL- helper:://hostname/repo' ' | |
673 | ( | |
674 | cd reltest && | |
675 | cp pristine-.git-config .git/config && | |
676 | cp pristine-.gitmodules .gitmodules && | |
677 | git config remote.origin.url helper:://hostname/repo && | |
678 | git submodule init && | |
679 | test "$(git config submodule.sub.url)" = helper:://hostname/subrepo | |
680 | ) | |
681 | ' | |
682 | ||
683 | test_expect_success '../subrepo works with scp-style URL - user@host:repo' ' | |
ea640cc6 TR |
684 | ( |
685 | cd reltest && | |
686 | cp pristine-.git-config .git/config && | |
687 | git config remote.origin.url user@host:repo && | |
688 | git submodule init && | |
689 | test "$(git config submodule.sub.url)" = user@host:subrepo | |
690 | ) | |
691 | ' | |
692 | ||
712693e8 JS |
693 | test_expect_success '../subrepo works with scp-style URL - user@host:path/to/repo' ' |
694 | ( | |
695 | cd reltest && | |
696 | cp pristine-.git-config .git/config && | |
697 | cp pristine-.gitmodules .gitmodules && | |
698 | git config remote.origin.url user@host:path/to/repo && | |
699 | git submodule init && | |
700 | test "$(git config submodule.sub.url)" = user@host:path/to/subrepo | |
701 | ) | |
702 | ' | |
703 | ||
758615e2 | 704 | test_expect_success '../subrepo works with relative local path - foo' ' |
49301c64 JS |
705 | ( |
706 | cd reltest && | |
707 | cp pristine-.git-config .git/config && | |
708 | cp pristine-.gitmodules .gitmodules && | |
709 | git config remote.origin.url foo && | |
710 | # actual: fails with an error | |
711 | git submodule init && | |
712 | test "$(git config submodule.sub.url)" = subrepo | |
713 | ) | |
714 | ' | |
715 | ||
712693e8 JS |
716 | test_expect_success '../subrepo works with relative local path - foo/bar' ' |
717 | ( | |
718 | cd reltest && | |
719 | cp pristine-.git-config .git/config && | |
720 | cp pristine-.gitmodules .gitmodules && | |
721 | git config remote.origin.url foo/bar && | |
722 | git submodule init && | |
723 | test "$(git config submodule.sub.url)" = foo/subrepo | |
724 | ) | |
725 | ' | |
726 | ||
758615e2 | 727 | test_expect_success '../subrepo works with relative local path - ./foo' ' |
49301c64 JS |
728 | ( |
729 | cd reltest && | |
730 | cp pristine-.git-config .git/config && | |
731 | cp pristine-.gitmodules .gitmodules && | |
732 | git config remote.origin.url ./foo && | |
733 | git submodule init && | |
734 | test "$(git config submodule.sub.url)" = subrepo | |
735 | ) | |
736 | ' | |
737 | ||
758615e2 | 738 | test_expect_success '../subrepo works with relative local path - ./foo/bar' ' |
49301c64 JS |
739 | ( |
740 | cd reltest && | |
741 | cp pristine-.git-config .git/config && | |
742 | cp pristine-.gitmodules .gitmodules && | |
743 | git config remote.origin.url ./foo/bar && | |
744 | git submodule init && | |
745 | test "$(git config submodule.sub.url)" = foo/subrepo | |
746 | ) | |
747 | ' | |
748 | ||
712693e8 JS |
749 | test_expect_success '../subrepo works with relative local path - ../foo' ' |
750 | ( | |
751 | cd reltest && | |
752 | cp pristine-.git-config .git/config && | |
753 | cp pristine-.gitmodules .gitmodules && | |
754 | git config remote.origin.url ../foo && | |
755 | git submodule init && | |
756 | test "$(git config submodule.sub.url)" = ../subrepo | |
757 | ) | |
758 | ' | |
759 | ||
760 | test_expect_success '../subrepo works with relative local path - ../foo/bar' ' | |
761 | ( | |
762 | cd reltest && | |
763 | cp pristine-.git-config .git/config && | |
764 | cp pristine-.gitmodules .gitmodules && | |
765 | git config remote.origin.url ../foo/bar && | |
766 | git submodule init && | |
767 | test "$(git config submodule.sub.url)" = ../foo/subrepo | |
768 | ) | |
769 | ' | |
770 | ||
771 | test_expect_success '../bar/a/b/c works with relative local path - ../foo/bar.git' ' | |
772 | ( | |
773 | cd reltest && | |
774 | cp pristine-.git-config .git/config && | |
775 | cp pristine-.gitmodules .gitmodules && | |
776 | mkdir -p a/b/c && | |
777 | (cd a/b/c; git init) && | |
778 | git config remote.origin.url ../foo/bar.git && | |
779 | git submodule add ../bar/a/b/c ./a/b/c && | |
780 | git submodule init && | |
781 | test "$(git config submodule.a/b/c.url)" = ../foo/bar/a/b/c | |
782 | ) | |
783 | ' | |
784 | ||
d75219b4 JL |
785 | test_expect_success 'moving the superproject does not break submodules' ' |
786 | ( | |
787 | cd addtest && | |
788 | git submodule status >expect | |
99094a7a | 789 | ) && |
d75219b4 JL |
790 | mv addtest addtest2 && |
791 | ( | |
792 | cd addtest2 && | |
793 | git submodule status >actual && | |
794 | test_cmp expect actual | |
795 | ) | |
796 | ' | |
797 | ||
73b0898d JL |
798 | test_expect_success 'submodule add --name allows to replace a submodule with another at the same path' ' |
799 | ( | |
800 | cd addtest2 && | |
801 | ( | |
802 | cd repo && | |
803 | echo "$submodurl/repo" >expect && | |
804 | git config remote.origin.url >actual && | |
805 | test_cmp expect actual && | |
806 | echo "gitdir: ../.git/modules/repo" >expect && | |
807 | test_cmp expect .git | |
808 | ) && | |
809 | rm -rf repo && | |
810 | git rm repo && | |
811 | git submodule add -q --name repo_new "$submodurl/bare.git" repo >actual && | |
ca8d148d | 812 | test_must_be_empty actual && |
73b0898d JL |
813 | echo "gitdir: ../.git/modules/submod" >expect && |
814 | test_cmp expect submod/.git && | |
815 | ( | |
816 | cd repo && | |
817 | echo "$submodurl/bare.git" >expect && | |
818 | git config remote.origin.url >actual && | |
819 | test_cmp expect actual && | |
820 | echo "gitdir: ../.git/modules/repo_new" >expect && | |
821 | test_cmp expect .git | |
822 | ) && | |
823 | echo "repo" >expect && | |
95c16418 | 824 | test_must_fail git config -f .gitmodules submodule.repo.path && |
73b0898d JL |
825 | git config -f .gitmodules submodule.repo_new.path >actual && |
826 | test_cmp expect actual&& | |
827 | echo "$submodurl/repo" >expect && | |
95c16418 | 828 | test_must_fail git config -f .gitmodules submodule.repo.url && |
73b0898d JL |
829 | echo "$submodurl/bare.git" >expect && |
830 | git config -f .gitmodules submodule.repo_new.url >actual && | |
831 | test_cmp expect actual && | |
832 | echo "$submodurl/repo" >expect && | |
833 | git config submodule.repo.url >actual && | |
834 | test_cmp expect actual && | |
835 | echo "$submodurl/bare.git" >expect && | |
836 | git config submodule.repo_new.url >actual && | |
837 | test_cmp expect actual | |
838 | ) | |
839 | ' | |
840 | ||
f8eaa0ba | 841 | test_expect_success 'recursive relative submodules stay relative' ' |
3fea121d SB |
842 | test_when_finished "rm -rf super clone2 subsub sub3" && |
843 | mkdir subsub && | |
844 | ( | |
845 | cd subsub && | |
846 | git init && | |
847 | >t && | |
848 | git add t && | |
849 | git commit -m "initial commit" | |
850 | ) && | |
851 | mkdir sub3 && | |
852 | ( | |
853 | cd sub3 && | |
854 | git init && | |
855 | >t && | |
856 | git add t && | |
857 | git commit -m "initial commit" && | |
858 | git submodule add ../subsub dirdir/subsub && | |
859 | git commit -m "add submodule subsub" | |
860 | ) && | |
861 | mkdir super && | |
862 | ( | |
863 | cd super && | |
864 | git init && | |
865 | >t && | |
866 | git add t && | |
867 | git commit -m "initial commit" && | |
868 | git submodule add ../sub3 && | |
869 | git commit -m "add submodule sub" | |
870 | ) && | |
871 | git clone super clone2 && | |
872 | ( | |
873 | cd clone2 && | |
874 | git submodule update --init --recursive && | |
875 | echo "gitdir: ../.git/modules/sub3" >./sub3/.git_expect && | |
876 | echo "gitdir: ../../../.git/modules/sub3/modules/dirdir/subsub" >./sub3/dirdir/subsub/.git_expect | |
877 | ) && | |
878 | test_cmp clone2/sub3/.git_expect clone2/sub3/.git && | |
879 | test_cmp clone2/sub3/dirdir/subsub/.git_expect clone2/sub3/dirdir/subsub/.git | |
73b0898d JL |
880 | ' |
881 | ||
4b7c286e JL |
882 | test_expect_success 'submodule add with an existing name fails unless forced' ' |
883 | ( | |
884 | cd addtest2 && | |
885 | rm -rf repo && | |
886 | git rm repo && | |
887 | test_must_fail git submodule add -q --name repo_new "$submodurl/repo.git" repo && | |
888 | test ! -d repo && | |
95c16418 JL |
889 | test_must_fail git config -f .gitmodules submodule.repo_new.path && |
890 | test_must_fail git config -f .gitmodules submodule.repo_new.url && | |
4b7c286e JL |
891 | echo "$submodurl/bare.git" >expect && |
892 | git config submodule.repo_new.url >actual && | |
893 | test_cmp expect actual && | |
894 | git submodule add -f -q --name repo_new "$submodurl/repo.git" repo && | |
895 | test -d repo && | |
896 | echo "repo" >expect && | |
897 | git config -f .gitmodules submodule.repo_new.path >actual && | |
898 | test_cmp expect actual&& | |
899 | echo "$submodurl/repo.git" >expect && | |
900 | git config -f .gitmodules submodule.repo_new.url >actual && | |
901 | test_cmp expect actual && | |
902 | echo "$submodurl/repo.git" >expect && | |
903 | git config submodule.repo_new.url >actual && | |
904 | test_cmp expect actual | |
905 | ) | |
906 | ' | |
907 | ||
cf419828 JL |
908 | test_expect_success 'set up a second submodule' ' |
909 | git submodule add ./init2 example2 && | |
910 | git commit -m "submodule example2 added" | |
911 | ' | |
912 | ||
84ba959b SB |
913 | test_expect_success 'submodule deinit works on repository without submodules' ' |
914 | test_when_finished "rm -rf newdirectory" && | |
915 | mkdir newdirectory && | |
916 | ( | |
917 | cd newdirectory && | |
918 | git init && | |
919 | >file && | |
920 | git add file && | |
14544dd2 | 921 | git commit -m "repo should not be empty" && |
f6a52799 SB |
922 | git submodule deinit . && |
923 | git submodule deinit --all | |
84ba959b SB |
924 | ) |
925 | ' | |
926 | ||
cf419828 JL |
927 | test_expect_success 'submodule deinit should remove the whole submodule section from .git/config' ' |
928 | git config submodule.example.foo bar && | |
929 | git config submodule.example2.frotz nitfol && | |
930 | git submodule deinit init && | |
931 | test -z "$(git config --get-regexp "submodule\.example\.")" && | |
932 | test -n "$(git config --get-regexp "submodule\.example2\.")" && | |
933 | test -f example2/.git && | |
934 | rmdir init | |
935 | ' | |
936 | ||
091a6eb0 JK |
937 | test_expect_success 'submodule deinit from subdirectory' ' |
938 | git submodule update --init && | |
939 | git config submodule.example.foo bar && | |
940 | mkdir -p sub && | |
941 | ( | |
942 | cd sub && | |
943 | git submodule deinit ../init >../output | |
944 | ) && | |
1edbaac3 | 945 | test_i18ngrep "\\.\\./init" output && |
091a6eb0 JK |
946 | test -z "$(git config --get-regexp "submodule\.example\.")" && |
947 | test -n "$(git config --get-regexp "submodule\.example2\.")" && | |
948 | test -f example2/.git && | |
949 | rmdir init | |
950 | ' | |
951 | ||
cf419828 JL |
952 | test_expect_success 'submodule deinit . deinits all initialized submodules' ' |
953 | git submodule update --init && | |
954 | git config submodule.example.foo bar && | |
955 | git config submodule.example2.frotz nitfol && | |
956 | test_must_fail git submodule deinit && | |
7b294bf4 | 957 | git submodule deinit . >actual && |
cf419828 JL |
958 | test -z "$(git config --get-regexp "submodule\.example\.")" && |
959 | test -z "$(git config --get-regexp "submodule\.example2\.")" && | |
7b294bf4 JL |
960 | test_i18ngrep "Cleared directory .init" actual && |
961 | test_i18ngrep "Cleared directory .example2" actual && | |
cf419828 JL |
962 | rmdir init example2 |
963 | ' | |
964 | ||
f6a52799 SB |
965 | test_expect_success 'submodule deinit --all deinits all initialized submodules' ' |
966 | git submodule update --init && | |
967 | git config submodule.example.foo bar && | |
968 | git config submodule.example2.frotz nitfol && | |
969 | test_must_fail git submodule deinit && | |
970 | git submodule deinit --all >actual && | |
971 | test -z "$(git config --get-regexp "submodule\.example\.")" && | |
972 | test -z "$(git config --get-regexp "submodule\.example2\.")" && | |
973 | test_i18ngrep "Cleared directory .init" actual && | |
974 | test_i18ngrep "Cleared directory .example2" actual && | |
975 | rmdir init example2 | |
976 | ' | |
977 | ||
cf419828 JL |
978 | test_expect_success 'submodule deinit deinits a submodule when its work tree is missing or empty' ' |
979 | git submodule update --init && | |
980 | rm -rf init example2/* example2/.git && | |
7b294bf4 | 981 | git submodule deinit init example2 >actual && |
cf419828 JL |
982 | test -z "$(git config --get-regexp "submodule\.example\.")" && |
983 | test -z "$(git config --get-regexp "submodule\.example2\.")" && | |
7b294bf4 JL |
984 | test_i18ngrep ! "Cleared directory .init" actual && |
985 | test_i18ngrep "Cleared directory .example2" actual && | |
cf419828 JL |
986 | rmdir init |
987 | ' | |
988 | ||
989 | test_expect_success 'submodule deinit fails when the submodule contains modifications unless forced' ' | |
990 | git submodule update --init && | |
991 | echo X >>init/s && | |
992 | test_must_fail git submodule deinit init && | |
993 | test -n "$(git config --get-regexp "submodule\.example\.")" && | |
994 | test -f example2/.git && | |
7b294bf4 | 995 | git submodule deinit -f init >actual && |
cf419828 | 996 | test -z "$(git config --get-regexp "submodule\.example\.")" && |
7b294bf4 | 997 | test_i18ngrep "Cleared directory .init" actual && |
cf419828 JL |
998 | rmdir init |
999 | ' | |
1000 | ||
1001 | test_expect_success 'submodule deinit fails when the submodule contains untracked files unless forced' ' | |
1002 | git submodule update --init && | |
1003 | echo X >>init/untracked && | |
1004 | test_must_fail git submodule deinit init && | |
1005 | test -n "$(git config --get-regexp "submodule\.example\.")" && | |
1006 | test -f example2/.git && | |
7b294bf4 | 1007 | git submodule deinit -f init >actual && |
cf419828 | 1008 | test -z "$(git config --get-regexp "submodule\.example\.")" && |
7b294bf4 | 1009 | test_i18ngrep "Cleared directory .init" actual && |
cf419828 JL |
1010 | rmdir init |
1011 | ' | |
1012 | ||
1013 | test_expect_success 'submodule deinit fails when the submodule HEAD does not match unless forced' ' | |
1014 | git submodule update --init && | |
1015 | ( | |
1016 | cd init && | |
1017 | git checkout HEAD^ | |
1018 | ) && | |
1019 | test_must_fail git submodule deinit init && | |
1020 | test -n "$(git config --get-regexp "submodule\.example\.")" && | |
1021 | test -f example2/.git && | |
7b294bf4 | 1022 | git submodule deinit -f init >actual && |
cf419828 | 1023 | test -z "$(git config --get-regexp "submodule\.example\.")" && |
7b294bf4 | 1024 | test_i18ngrep "Cleared directory .init" actual && |
cf419828 JL |
1025 | rmdir init |
1026 | ' | |
1027 | ||
1028 | test_expect_success 'submodule deinit is silent when used on an uninitialized submodule' ' | |
1029 | git submodule update --init && | |
1030 | git submodule deinit init >actual && | |
1031 | test_i18ngrep "Submodule .example. (.*) unregistered for path .init" actual && | |
7b294bf4 | 1032 | test_i18ngrep "Cleared directory .init" actual && |
cf419828 JL |
1033 | git submodule deinit init >actual && |
1034 | test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual && | |
7b294bf4 | 1035 | test_i18ngrep "Cleared directory .init" actual && |
cf419828 JL |
1036 | git submodule deinit . >actual && |
1037 | test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual && | |
1038 | test_i18ngrep "Submodule .example2. (.*) unregistered for path .example2" actual && | |
7b294bf4 | 1039 | test_i18ngrep "Cleared directory .init" actual && |
cf419828 JL |
1040 | git submodule deinit . >actual && |
1041 | test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual && | |
1042 | test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual && | |
7b294bf4 | 1043 | test_i18ngrep "Cleared directory .init" actual && |
f6a52799 SB |
1044 | git submodule deinit --all >actual && |
1045 | test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual && | |
1046 | test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual && | |
1047 | test_i18ngrep "Cleared directory .init" actual && | |
cf419828 JL |
1048 | rmdir init example2 |
1049 | ' | |
1050 | ||
1051 | test_expect_success 'submodule deinit fails when submodule has a .git directory even when forced' ' | |
1052 | git submodule update --init && | |
1053 | ( | |
1054 | cd init && | |
1055 | rm .git && | |
1056 | cp -R ../.git/modules/example .git && | |
1057 | GIT_WORK_TREE=. git config --unset core.worktree | |
1058 | ) && | |
1059 | test_must_fail git submodule deinit init && | |
1060 | test_must_fail git submodule deinit -f init && | |
1061 | test -d init/.git && | |
1062 | test -n "$(git config --get-regexp "submodule\.example\.")" | |
1063 | ' | |
1064 | ||
bed94704 TB |
1065 | test_expect_success 'submodule with UTF-8 name' ' |
1066 | svname=$(printf "\303\245 \303\244\303\266") && | |
1067 | mkdir "$svname" && | |
74671241 | 1068 | ( |
bed94704 | 1069 | cd "$svname" && |
74671241 | 1070 | git init && |
bed94704 TB |
1071 | >sub && |
1072 | git add sub && | |
74671241 | 1073 | git commit -m "init sub" |
bed94704 | 1074 | ) && |
bed94704 TB |
1075 | git submodule add ./"$svname" && |
1076 | git submodule >&2 && | |
1077 | test -n "$(git submodule | grep "$svname")" | |
74671241 | 1078 | ' |
2bb7afac | 1079 | |
275cd184 FG |
1080 | test_expect_success 'submodule add clone shallow submodule' ' |
1081 | mkdir super && | |
99094a7a | 1082 | pwd=$(pwd) && |
275cd184 FG |
1083 | ( |
1084 | cd super && | |
1085 | git init && | |
1086 | git submodule add --depth=1 file://"$pwd"/example2 submodule && | |
1087 | ( | |
1088 | cd submodule && | |
1089 | test 1 = $(git log --oneline | wc -l) | |
1090 | ) | |
1091 | ) | |
1092 | ' | |
1093 | ||
2b56bb7a SB |
1094 | test_expect_success 'submodule helper list is not confused by common prefixes' ' |
1095 | mkdir -p dir1/b && | |
1096 | ( | |
1097 | cd dir1/b && | |
1098 | git init && | |
1099 | echo hi >testfile2 && | |
1100 | git add . && | |
1101 | git commit -m "test1" | |
1102 | ) && | |
1103 | mkdir -p dir2/b && | |
1104 | ( | |
1105 | cd dir2/b && | |
1106 | git init && | |
1107 | echo hello >testfile1 && | |
1108 | git add . && | |
1109 | git commit -m "test2" | |
1110 | ) && | |
1111 | git submodule add /dir1/b dir1/b && | |
1112 | git submodule add /dir2/b dir2/b && | |
1113 | git commit -m "first submodule commit" && | |
1114 | git submodule--helper list dir1/b |cut -c51- >actual && | |
1115 | echo "dir1/b" >expect && | |
1116 | test_cmp expect actual | |
1117 | ' | |
1118 | ||
275cd184 | 1119 | |
88961ef2 | 1120 | test_done |