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