3 # Copyright (c) 2007 Lars Hjemli
6 test_description
='Basic porcelain support for submodules
8 This test tries to verify basic sanity of the init, update and status
9 subcommands of git submodule.
12 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
=main
13 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
17 test_expect_success
'setup - enable local submodules' '
18 git config --global protocol.file.allow always
21 test_expect_success
'submodule usage: -h' '
22 git submodule -h >out 2>err &&
23 grep "^usage: git submodule" out &&
24 test_must_be_empty err
27 test_expect_success
'submodule usage: --recursive' '
28 test_expect_code 1 git submodule --recursive >out 2>err &&
29 grep "^usage: git submodule" err &&
30 test_must_be_empty out
33 test_expect_success
'submodule usage: status --' '
34 test_expect_code 1 git submodule -- &&
35 test_expect_code 1 git submodule --end-of-options
38 for opt
in '--quiet' '--cached'
40 test_expect_success
"submodule usage: status $opt" '
42 git submodule status $opt &&
43 git submodule $opt status
47 test_expect_success
'submodule deinit works on empty repository' '
48 git submodule deinit --all
51 test_expect_success
'setup - initial commit' '
54 git commit -m "initial commit" &&
58 test_expect_success
'submodule init aborts on missing .gitmodules file' '
59 test_when_finished "git update-index --remove sub" &&
60 git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
61 # missing the .gitmodules file here
62 test_must_fail git submodule init 2>actual &&
63 test_i18ngrep "No url found for submodule path" actual
66 test_expect_success
'submodule update aborts on missing .gitmodules file' '
67 test_when_finished "git update-index --remove sub" &&
68 git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
69 # missing the .gitmodules file here
70 git submodule update sub 2>actual &&
71 test_i18ngrep "Submodule path .sub. not initialized" actual
74 test_expect_success
'submodule update aborts on missing gitmodules url' '
75 test_when_finished "git update-index --remove sub" &&
76 git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
77 test_when_finished "rm -f .gitmodules" &&
78 git config -f .gitmodules submodule.s.path sub &&
79 test_must_fail git submodule init
82 test_expect_success
'add aborts on repository with no commits' '
83 cat >expect <<-\EOF &&
84 fatal: '"'repo-no-commits'"' does not have a commit checked out
86 git init repo-no-commits &&
87 test_must_fail git submodule add ../a ./repo-no-commits 2>actual &&
88 test_cmp expect actual
91 test_expect_success
'status should ignore inner git repo when not added' '
99 git commit -m "initial"
101 test_must_fail git submodule status inner 2>output.err &&
103 test_i18ngrep "^error: .*did not match any file(s) known to git" output.err
106 test_expect_success
'setup - repository in init subdirectory' '
113 git commit -m "submodule commit 1" &&
114 git tag -a -m "rev-1" rev-1
118 test_expect_success
'setup - commit with gitlink' '
122 git commit -m "super commit 1"
125 test_expect_success
'setup - hide init subdirectory' '
129 test_expect_success
'setup - repository to add submodules to' '
131 git init addtest-ignore
134 # The 'submodule add' tests need some repository to add as a submodule.
135 # The trash directory is a good one as any. We need to canonicalize
136 # the name, though, as some tests compare it to the absolute path git
137 # generates, which will expand symbolic links.
141 git for-each-ref
--format='%(refname)' 'refs/heads/*'
150 listbranches
>"$dotdot/heads" &&
151 { git symbolic-ref HEAD ||
:; } >"$dotdot/head" &&
152 git rev-parse HEAD
>"$dotdot/head-sha1" &&
153 git update-index
--refresh &&
154 git diff-files
--exit-code &&
155 git clean
-n -d -x >"$dotdot/untracked"
159 test_expect_success
'submodule add' '
160 echo "refs/heads/main" >expect &&
164 git submodule add -q "$submodurl" submod >actual &&
165 test_must_be_empty actual &&
166 echo "gitdir: ../.git/modules/submod" >expect &&
167 test_cmp expect submod/.git &&
170 git config core.worktree >actual &&
171 echo "../../../submod" >expect &&
172 test_cmp expect actual &&
178 rm -f heads head untracked &&
179 inspect addtest/submod ../.. &&
180 test_cmp expect heads &&
181 test_cmp expect head &&
182 test_must_be_empty untracked
185 test_expect_success
!WINDOWS
'submodule add (absolute path)' '
186 test_when_finished "git reset --hard" &&
187 git submodule add "$submodurl" "$submodurl/add-abs"
190 test_expect_success
'setup parent and one repository' '
191 test_create_repo parent &&
192 test_commit -C parent one
195 test_expect_success
'redirected submodule add does not show progress' '
196 git -C addtest submodule add "file://$submodurl/parent" submod-redirected \
199 test_i18ngrep ! "Checking connectivity" err
202 test_expect_success
'redirected submodule add --progress does show progress' '
203 git -C addtest submodule add --progress "file://$submodurl/parent" \
204 submod-redirected-progress 2>err && \
208 test_expect_success
'submodule add to .gitignored path fails' '
211 cat <<-\EOF >expect &&
212 The following paths are ignored by one of your .gitignore files:
214 hint: Use -f if you really want to add them.
215 hint: Turn this message off by running
216 hint: "git config advice.addIgnoredFile false"
218 # Does not use test_commit due to the ignore
219 echo "*" > .gitignore &&
220 git add --force .gitignore &&
221 git commit -m"Ignore everything" &&
222 ! git submodule add "$submodurl" submod >actual 2>&1 &&
223 test_cmp expect actual
227 test_expect_success
'submodule add to .gitignored path with --force' '
230 git submodule add --force "$submodurl" submod
234 test_expect_success
'submodule add to path with tracked content fails' '
237 echo "fatal: '\''dir-tracked'\'' already exists in the index" >expect &&
239 test_commit foo dir-tracked/bar &&
240 test_must_fail git submodule add "$submodurl" dir-tracked >actual 2>&1 &&
241 test_cmp expect actual
245 test_expect_success
'submodule add to reconfigure existing submodule with --force' '
248 bogus_url="$(pwd)/bogus-url" &&
249 git submodule add --force "$bogus_url" submod &&
250 git submodule add --force -b initial "$submodurl" submod-branch &&
251 test "$bogus_url" = "$(git config -f .gitmodules submodule.submod.url)" &&
252 test "$bogus_url" = "$(git config submodule.submod.url)" &&
254 git submodule add --force "$submodurl" submod &&
255 test "$submodurl" = "$(git config -f .gitmodules submodule.submod.url)" &&
256 test "$submodurl" = "$(git config submodule.submod.url)"
260 test_expect_success
'submodule add relays add --dry-run stderr' '
261 test_when_finished "rm -rf addtest/.git/index.lock" &&
264 : >.git/index.lock &&
265 ! git submodule add "$submodurl" sub-while-locked 2>output.err &&
266 test_i18ngrep "^fatal: .*index\.lock" output.err &&
267 test_path_is_missing sub-while-locked
271 test_expect_success
'submodule add --branch' '
272 echo "refs/heads/initial" >expect-head &&
273 cat <<-\EOF >expect-heads &&
280 git submodule add -b initial "$submodurl" submod-branch &&
281 test "initial" = "$(git config -f .gitmodules submodule.submod-branch.branch)" &&
285 rm -f heads head untracked &&
286 inspect addtest/submod-branch ../.. &&
287 test_cmp expect-heads heads &&
288 test_cmp expect-head head &&
289 test_must_be_empty untracked
292 test_expect_success
'submodule add with ./ in path' '
293 echo "refs/heads/main" >expect &&
297 git submodule add "$submodurl" ././dotsubmod/./frotz/./ &&
301 rm -f heads head untracked &&
302 inspect addtest/dotsubmod/frotz ../../.. &&
303 test_cmp expect heads &&
304 test_cmp expect head &&
305 test_must_be_empty untracked
308 test_expect_success
'submodule add with /././ in path' '
309 echo "refs/heads/main" >expect &&
313 git submodule add "$submodurl" dotslashdotsubmod/././frotz/./ &&
317 rm -f heads head untracked &&
318 inspect addtest/dotslashdotsubmod/frotz ../../.. &&
319 test_cmp expect heads &&
320 test_cmp expect head &&
321 test_must_be_empty untracked
324 test_expect_success
'submodule add with // in path' '
325 echo "refs/heads/main" >expect &&
329 git submodule add "$submodurl" slashslashsubmod///frotz// &&
333 rm -f heads head untracked &&
334 inspect addtest/slashslashsubmod/frotz ../../.. &&
335 test_cmp expect heads &&
336 test_cmp expect head &&
337 test_must_be_empty untracked
340 test_expect_success
'submodule add with /.. in path' '
341 echo "refs/heads/main" >expect &&
345 git submodule add "$submodurl" dotdotsubmod/../realsubmod/frotz/.. &&
349 rm -f heads head untracked &&
350 inspect addtest/realsubmod ../.. &&
351 test_cmp expect heads &&
352 test_cmp expect head &&
353 test_must_be_empty untracked
356 test_expect_success
'submodule add with ./, /.. and // in path' '
357 echo "refs/heads/main" >expect &&
361 git submodule add "$submodurl" dot/dotslashsubmod/./../..////realsubmod2/a/b/c/d/../../../../frotz//.. &&
365 rm -f heads head untracked &&
366 inspect addtest/realsubmod2 ../.. &&
367 test_cmp expect heads &&
368 test_cmp expect head &&
369 test_must_be_empty untracked
372 test_expect_success
!CYGWIN
'submodule add with \\ in path' '
373 test_when_finished "rm -rf parent sub\\with\\backslash" &&
375 # Initialize a repo with a backslash in its name
376 git init sub\\with\\backslash &&
377 touch sub\\with\\backslash/empty.file &&
378 git -C sub\\with\\backslash add empty.file &&
379 git -C sub\\with\\backslash commit -m "Added empty.file" &&
381 # Add that repository as a submodule
383 git -C parent submodule add ../sub\\with\\backslash
386 test_expect_success
'submodule add in subdirectory' '
387 echo "refs/heads/main" >expect &&
392 git submodule add "$submodurl" ../realsubmod3 &&
396 rm -f heads head untracked &&
397 inspect addtest/realsubmod3 ../.. &&
398 test_cmp expect heads &&
399 test_cmp expect head &&
400 test_must_be_empty untracked
403 test_expect_success
'submodule add in subdirectory with relative path should fail' '
406 test_must_fail git submodule add ../../ submod3 2>../../output.err
408 test_i18ngrep toplevel output.err
411 test_expect_success
'setup - add an example entry to .gitmodules' '
412 git config --file=.gitmodules submodule.example.url git://example.com/init.git
415 test_expect_success
'status should fail for unmapped paths' '
416 test_must_fail git submodule status
419 test_expect_success
'setup - map path in .gitmodules' '
420 cat <<\EOF >expect &&
421 [submodule "example"]
422 url = git://example.com/init.git
426 git config --file=.gitmodules submodule.example.path init &&
428 test_cmp expect .gitmodules
431 test_expect_success
'status should only print one line' '
432 git submodule status >lines &&
433 test_line_count = 1 lines
436 test_expect_success
'status from subdirectory should have the same SHA1' '
437 test_when_finished "rmdir addtest/subdir" &&
441 git submodule status >output &&
442 awk "{print \$1}" <output >expect &&
444 git submodule status >../output &&
445 awk "{print \$1}" <../output >../actual &&
446 test_cmp ../expect ../actual &&
447 git -C ../submod checkout HEAD^ &&
448 git submodule status >../output &&
449 awk "{print \$1}" <../output >../actual2 &&
451 git submodule status >output &&
452 awk "{print \$1}" <output >expect2 &&
453 test_cmp expect2 actual2 &&
454 ! test_cmp actual actual2
458 test_expect_success
'setup - fetch commit name from submodule' '
459 rev1=$(cd .subrepo && git rev-parse HEAD) &&
460 printf "rev1: %s\n" "$rev1" &&
464 test_expect_success
'status should initially be "missing"' '
465 git submodule status >lines &&
469 test_expect_success
'init should register submodule url in .git/config' '
470 echo git://example.com/init.git >expect &&
472 git submodule init &&
473 git config submodule.example.url >url &&
474 git config submodule.example.url ./.subrepo &&
479 test_expect_success
'status should still be "missing" after initializing' '
482 git submodule status >lines &&
487 test_failure_with_unknown_submodule
() {
488 test_must_fail git submodule
$1 no-such-submodule
2>output.err
&&
489 test_i18ngrep
"^error: .*no-such-submodule" output.err
492 test_expect_success
'init should fail with unknown submodule' '
493 test_failure_with_unknown_submodule init
496 test_expect_success
'update should fail with unknown submodule' '
497 test_failure_with_unknown_submodule update
500 test_expect_success
'status should fail with unknown submodule' '
501 test_failure_with_unknown_submodule status
504 test_expect_success
'sync should fail with unknown submodule' '
505 test_failure_with_unknown_submodule sync
508 test_expect_success
'update should fail when path is used by a file' '
509 echo hello >expect &&
511 echo "hello" >init &&
512 test_must_fail git submodule update &&
517 test_expect_success
'update should fail when path is used by a nonempty directory' '
518 echo hello >expect &&
522 echo "hello" >init/a &&
524 test_must_fail git submodule update &&
526 test_cmp expect init/a
529 test_expect_success
'update should work when path is an empty dir' '
532 echo "$rev1" >expect &&
535 git submodule update -q >update.out &&
536 test_must_be_empty update.out &&
539 test_cmp expect head-sha1
542 test_expect_success
'status should be "up-to-date" after update' '
543 git submodule status >list &&
547 test_expect_success
'status "up-to-date" from subdirectory' '
551 git submodule status >../list
553 grep "^ $rev1" list &&
554 grep "\\.\\./init" list
557 test_expect_success
'status "up-to-date" from subdirectory with path' '
561 git submodule status ../init >../list
563 grep "^ $rev1" list &&
564 grep "\\.\\./init" list
567 test_expect_success
'status should be "modified" after submodule commit' '
572 git commit -m "submodule commit 2"
575 rev2=$(cd init && git rev-parse HEAD) &&
577 git submodule status >list &&
582 test_expect_success
'the --cached sha1 should be rev1' '
583 git submodule --cached status >list &&
587 test_expect_success
'git diff should report the SHA1 of the new submodule commit' '
589 grep "^+Subproject commit $rev2" diff
592 test_expect_success
'update should checkout rev1' '
594 echo "$rev1" >expect &&
596 git submodule update init &&
599 test_cmp expect head-sha1
602 test_expect_success
'status should be "up-to-date" after update' '
603 git submodule status >list &&
607 test_expect_success
'checkout superproject with subproject already present' '
608 git checkout initial &&
612 test_expect_success
'apply submodule diff' '
618 git commit -m "change subproject"
620 git update-index --add init &&
621 git commit -m "change init" &&
622 git format-patch -1 --stdout >P.diff &&
623 git checkout second &&
624 git apply --index P.diff &&
626 git diff --cached main >staged &&
627 test_must_be_empty staged
630 test_expect_success
'update --init' '
632 git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
633 git config --remove-section submodule.example &&
634 test_must_fail git config submodule.example.url &&
636 git submodule update init 2> update.out &&
637 test_i18ngrep "not initialized" update.out &&
638 test_must_fail git rev-parse --resolve-git-dir init/.git &&
640 git submodule update --init init &&
641 git rev-parse --resolve-git-dir init/.git
644 test_expect_success
'update --init from subdirectory' '
646 git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
647 git config --remove-section submodule.example &&
648 test_must_fail git config submodule.example.url &&
653 git submodule update ../init 2>update.out &&
654 test_i18ngrep "not initialized" update.out &&
655 test_must_fail git rev-parse --resolve-git-dir ../init/.git &&
657 git submodule update --init ../init
659 git rev-parse --resolve-git-dir init/.git
662 test_expect_success
'do not add files from a submodule' '
665 test_must_fail git add init/a
669 test_expect_success
'gracefully add/reset submodule with a trailing slash' '
672 git commit -m "commit subproject" init &&
676 git diff --exit-code --cached init &&
678 git commit -m update a >/dev/null &&
679 git rev-parse HEAD) &&
681 test_must_fail git diff --exit-code --cached init &&
682 test $commit = $(git ls-files --stage |
683 sed -n "s/^160000 \([^ ]*\).*/\1/p") &&
685 git diff --exit-code --cached init
689 test_expect_success
'ls-files gracefully handles trailing slash' '
691 test "init" = "$(git ls-files init/)"
695 test_expect_success
'moving to a commit without submodule does not leave empty dir' '
699 git checkout initial &&
704 test_expect_success
'submodule <invalid-subcommand> fails' '
705 test_must_fail git submodule no-such-subcommand
708 test_expect_success
'add submodules without specifying an explicit path' '
715 git commit -m "repo commit 1"
717 git clone --bare repo/ bare.git &&
720 git submodule add "$submodurl/repo" &&
721 git config -f .gitmodules submodule.repo.path repo &&
722 git submodule add "$submodurl/bare.git" &&
723 git config -f .gitmodules submodule.bare.path bare
727 test_expect_success
'add should fail when path is used by a file' '
731 test_must_fail git submodule add "$submodurl/repo" file
735 test_expect_success
'add should fail when path is used by an existing directory' '
739 test_must_fail git submodule add "$submodurl/repo" empty-dir
743 test_expect_success
'use superproject as upstream when path is relative and no url is set there' '
746 git submodule add ../repo relative &&
747 test "$(git config -f .gitmodules submodule.relative.url)" = ../repo &&
748 git submodule sync relative &&
749 test "$(git config submodule.relative.url)" = "$submodurl/repo"
753 test_expect_success
'set up for relative path tests' '
765 git config -f .gitmodules submodule.sub.path sub &&
766 git config -f .gitmodules submodule.sub.url ../subrepo &&
767 cp .git/config pristine-.git-config &&
768 cp .gitmodules pristine-.gitmodules
772 test_expect_success
'../subrepo works with URL - ssh://hostname/repo' '
775 cp pristine-.git-config .git/config &&
776 cp pristine-.gitmodules .gitmodules &&
777 git config remote.origin.url ssh://hostname/repo &&
778 git submodule init &&
779 test "$(git config submodule.sub.url)" = ssh://hostname/subrepo
783 test_expect_success
'../subrepo works with port-qualified URL - ssh://hostname:22/repo' '
786 cp pristine-.git-config .git/config &&
787 cp pristine-.gitmodules .gitmodules &&
788 git config remote.origin.url ssh://hostname:22/repo &&
789 git submodule init &&
790 test "$(git config submodule.sub.url)" = ssh://hostname:22/subrepo
794 # About the choice of the path in the next test:
795 # - double-slash side-steps path mangling issues on Windows
796 # - it is still an absolute local path
797 # - there cannot be a server with a blank in its name just in case the
798 # path is used erroneously to access a //server/share style path
799 test_expect_success
'../subrepo path works with local path - //somewhere else/repo' '
802 cp pristine-.git-config .git/config &&
803 cp pristine-.gitmodules .gitmodules &&
804 git config remote.origin.url "//somewhere else/repo" &&
805 git submodule init &&
806 test "$(git config submodule.sub.url)" = "//somewhere else/subrepo"
810 test_expect_success
'../subrepo works with file URL - file:///tmp/repo' '
813 cp pristine-.git-config .git/config &&
814 cp pristine-.gitmodules .gitmodules &&
815 git config remote.origin.url file:///tmp/repo &&
816 git submodule init &&
817 test "$(git config submodule.sub.url)" = file:///tmp/subrepo
821 test_expect_success
'../subrepo works with helper URL- helper:://hostname/repo' '
824 cp pristine-.git-config .git/config &&
825 cp pristine-.gitmodules .gitmodules &&
826 git config remote.origin.url helper:://hostname/repo &&
827 git submodule init &&
828 test "$(git config submodule.sub.url)" = helper:://hostname/subrepo
832 test_expect_success
'../subrepo works with scp-style URL - user@host:repo' '
835 cp pristine-.git-config .git/config &&
836 git config remote.origin.url user@host:repo &&
837 git submodule init &&
838 test "$(git config submodule.sub.url)" = user@host:subrepo
842 test_expect_success
'../subrepo works with scp-style URL - user@host:path/to/repo' '
845 cp pristine-.git-config .git/config &&
846 cp pristine-.gitmodules .gitmodules &&
847 git config remote.origin.url user@host:path/to/repo &&
848 git submodule init &&
849 test "$(git config submodule.sub.url)" = user@host:path/to/subrepo
853 test_expect_success
'../subrepo works with relative local path - foo' '
856 cp pristine-.git-config .git/config &&
857 cp pristine-.gitmodules .gitmodules &&
858 git config remote.origin.url foo &&
859 # actual: fails with an error
860 git submodule init &&
861 test "$(git config submodule.sub.url)" = subrepo
865 test_expect_success
'../subrepo works with relative local path - foo/bar' '
868 cp pristine-.git-config .git/config &&
869 cp pristine-.gitmodules .gitmodules &&
870 git config remote.origin.url foo/bar &&
871 git submodule init &&
872 test "$(git config submodule.sub.url)" = foo/subrepo
876 test_expect_success
'../subrepo works with relative local path - ./foo' '
879 cp pristine-.git-config .git/config &&
880 cp pristine-.gitmodules .gitmodules &&
881 git config remote.origin.url ./foo &&
882 git submodule init &&
883 test "$(git config submodule.sub.url)" = subrepo
887 test_expect_success
'../subrepo works with relative local path - ./foo/bar' '
890 cp pristine-.git-config .git/config &&
891 cp pristine-.gitmodules .gitmodules &&
892 git config remote.origin.url ./foo/bar &&
893 git submodule init &&
894 test "$(git config submodule.sub.url)" = foo/subrepo
898 test_expect_success
'../subrepo works with relative local path - ../foo' '
901 cp pristine-.git-config .git/config &&
902 cp pristine-.gitmodules .gitmodules &&
903 git config remote.origin.url ../foo &&
904 git submodule init &&
905 test "$(git config submodule.sub.url)" = ../subrepo
909 test_expect_success
'../subrepo works with relative local path - ../foo/bar' '
912 cp pristine-.git-config .git/config &&
913 cp pristine-.gitmodules .gitmodules &&
914 git config remote.origin.url ../foo/bar &&
915 git submodule init &&
916 test "$(git config submodule.sub.url)" = ../foo/subrepo
920 test_expect_success
'../bar/a/b/c works with relative local path - ../foo/bar.git' '
923 cp pristine-.git-config .git/config &&
924 cp pristine-.gitmodules .gitmodules &&
926 (cd a/b/c && git init && test_commit msg) &&
927 git config remote.origin.url ../foo/bar.git &&
928 git submodule add ../bar/a/b/c ./a/b/c &&
929 git submodule init &&
930 test "$(git config submodule.a/b/c.url)" = ../foo/bar/a/b/c
934 test_expect_success
'moving the superproject does not break submodules' '
937 git submodule status >expect
939 mv addtest addtest2 &&
942 git submodule status >actual &&
943 test_cmp expect actual
947 test_expect_success
'moving the submodule does not break the superproject' '
952 sed -e "s/^ \([^ ]* repo\) .*/-\1/" <actual >expect &&
953 mv addtest2/repo addtest2/repo.bak &&
954 test_when_finished "mv addtest2/repo.bak addtest2/repo" &&
959 test_cmp expect actual
962 test_expect_success
'submodule add --name allows to replace a submodule with another at the same path' '
967 echo "$submodurl/repo" >expect &&
968 git config remote.origin.url >actual &&
969 test_cmp expect actual &&
970 echo "gitdir: ../.git/modules/repo" >expect &&
975 git submodule add -q --name repo_new "$submodurl/bare.git" repo >actual &&
976 test_must_be_empty actual &&
977 echo "gitdir: ../.git/modules/submod" >expect &&
978 test_cmp expect submod/.git &&
981 echo "$submodurl/bare.git" >expect &&
982 git config remote.origin.url >actual &&
983 test_cmp expect actual &&
984 echo "gitdir: ../.git/modules/repo_new" >expect &&
987 echo "repo" >expect &&
988 test_must_fail git config -f .gitmodules submodule.repo.path &&
989 git config -f .gitmodules submodule.repo_new.path >actual &&
990 test_cmp expect actual &&
991 echo "$submodurl/repo" >expect &&
992 test_must_fail git config -f .gitmodules submodule.repo.url &&
993 echo "$submodurl/bare.git" >expect &&
994 git config -f .gitmodules submodule.repo_new.url >actual &&
995 test_cmp expect actual &&
996 echo "$submodurl/repo" >expect &&
997 git config submodule.repo.url >actual &&
998 test_cmp expect actual &&
999 echo "$submodurl/bare.git" >expect &&
1000 git config submodule.repo_new.url >actual &&
1001 test_cmp expect actual
1005 test_expect_success
'recursive relative submodules stay relative' '
1006 test_when_finished "rm -rf super clone2 subsub sub3" &&
1013 git commit -m "initial commit"
1021 git commit -m "initial commit" &&
1022 git submodule add ../subsub dirdir/subsub &&
1023 git commit -m "add submodule subsub"
1031 git commit -m "initial commit" &&
1032 git submodule add ../sub3 &&
1033 git commit -m "add submodule sub"
1035 git clone super clone2 &&
1038 git submodule update --init --recursive &&
1039 echo "gitdir: ../.git/modules/sub3" >./sub3/.git_expect &&
1040 echo "gitdir: ../../../.git/modules/sub3/modules/dirdir/subsub" >./sub3/dirdir/subsub/.git_expect
1042 test_cmp clone2/sub3/.git_expect clone2/sub3/.git &&
1043 test_cmp clone2/sub3/dirdir/subsub/.git_expect clone2/sub3/dirdir/subsub/.git
1046 test_expect_success
'submodule add with an existing name fails unless forced' '
1051 test_must_fail git submodule add -q --name repo_new "$submodurl/repo.git" repo &&
1053 test_must_fail git config -f .gitmodules submodule.repo_new.path &&
1054 test_must_fail git config -f .gitmodules submodule.repo_new.url &&
1055 echo "$submodurl/bare.git" >expect &&
1056 git config submodule.repo_new.url >actual &&
1057 test_cmp expect actual &&
1058 git submodule add -f -q --name repo_new "$submodurl/repo.git" repo &&
1060 echo "repo" >expect &&
1061 git config -f .gitmodules submodule.repo_new.path >actual &&
1062 test_cmp expect actual &&
1063 echo "$submodurl/repo.git" >expect &&
1064 git config -f .gitmodules submodule.repo_new.url >actual &&
1065 test_cmp expect actual &&
1066 echo "$submodurl/repo.git" >expect &&
1067 git config submodule.repo_new.url >actual &&
1068 test_cmp expect actual
1072 test_expect_success
'set up a second submodule' '
1073 git submodule add ./init2 example2 &&
1074 git commit -m "submodule example2 added"
1077 test_expect_success
'submodule deinit works on repository without submodules' '
1078 test_when_finished "rm -rf newdirectory" &&
1079 mkdir newdirectory &&
1085 git commit -m "repo should not be empty" &&
1086 git submodule deinit . &&
1087 git submodule deinit --all
1091 test_expect_success
'submodule deinit should remove the whole submodule section from .git/config' '
1092 git config submodule.example.foo bar &&
1093 git config submodule.example2.frotz nitfol &&
1094 git submodule deinit init &&
1095 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1096 test -n "$(git config --get-regexp "submodule\.example2\.")" &&
1097 test -f example2/.git &&
1101 test_expect_success
'submodule deinit should unset core.worktree' '
1102 test_path_is_file .git/modules/example/config &&
1103 test_must_fail git config -f .git/modules/example/config core.worktree
1106 test_expect_success
'submodule deinit from subdirectory' '
1107 git submodule update --init &&
1108 git config submodule.example.foo bar &&
1112 git submodule deinit ../init >../output
1114 test_i18ngrep "\\.\\./init" output &&
1115 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1116 test -n "$(git config --get-regexp "submodule\.example2\.")" &&
1117 test -f example2/.git &&
1121 test_expect_success
'submodule deinit . deinits all initialized submodules' '
1122 git submodule update --init &&
1123 git config submodule.example.foo bar &&
1124 git config submodule.example2.frotz nitfol &&
1125 test_must_fail git submodule deinit &&
1126 git submodule deinit . >actual &&
1127 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1128 test -z "$(git config --get-regexp "submodule\.example2\.")" &&
1129 test_i18ngrep "Cleared directory .init" actual &&
1130 test_i18ngrep "Cleared directory .example2" actual &&
1134 test_expect_success
'submodule deinit --all deinits all initialized submodules' '
1135 git submodule update --init &&
1136 git config submodule.example.foo bar &&
1137 git config submodule.example2.frotz nitfol &&
1138 test_must_fail git submodule deinit &&
1139 git submodule deinit --all >actual &&
1140 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1141 test -z "$(git config --get-regexp "submodule\.example2\.")" &&
1142 test_i18ngrep "Cleared directory .init" actual &&
1143 test_i18ngrep "Cleared directory .example2" actual &&
1147 test_expect_success
'submodule deinit deinits a submodule when its work tree is missing or empty' '
1148 git submodule update --init &&
1149 rm -rf init example2/* example2/.git &&
1150 git submodule deinit init example2 >actual &&
1151 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1152 test -z "$(git config --get-regexp "submodule\.example2\.")" &&
1153 test_i18ngrep ! "Cleared directory .init" actual &&
1154 test_i18ngrep "Cleared directory .example2" actual &&
1158 test_expect_success
'submodule deinit fails when the submodule contains modifications unless forced' '
1159 git submodule update --init &&
1161 test_must_fail git submodule deinit init &&
1162 test -n "$(git config --get-regexp "submodule\.example\.")" &&
1163 test -f example2/.git &&
1164 git submodule deinit -f init >actual &&
1165 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1166 test_i18ngrep "Cleared directory .init" actual &&
1170 test_expect_success
'submodule deinit fails when the submodule contains untracked files unless forced' '
1171 git submodule update --init &&
1172 echo X >>init/untracked &&
1173 test_must_fail git submodule deinit init &&
1174 test -n "$(git config --get-regexp "submodule\.example\.")" &&
1175 test -f example2/.git &&
1176 git submodule deinit -f init >actual &&
1177 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1178 test_i18ngrep "Cleared directory .init" actual &&
1182 test_expect_success
'submodule deinit fails when the submodule HEAD does not match unless forced' '
1183 git submodule update --init &&
1188 test_must_fail git submodule deinit init &&
1189 test -n "$(git config --get-regexp "submodule\.example\.")" &&
1190 test -f example2/.git &&
1191 git submodule deinit -f init >actual &&
1192 test -z "$(git config --get-regexp "submodule\.example\.")" &&
1193 test_i18ngrep "Cleared directory .init" actual &&
1197 test_expect_success
'submodule deinit is silent when used on an uninitialized submodule' '
1198 git submodule update --init &&
1199 git submodule deinit init >actual &&
1200 test_i18ngrep "Submodule .example. (.*) unregistered for path .init" actual &&
1201 test_i18ngrep "Cleared directory .init" actual &&
1202 git submodule deinit init >actual &&
1203 test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
1204 test_i18ngrep "Cleared directory .init" actual &&
1205 git submodule deinit . >actual &&
1206 test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
1207 test_i18ngrep "Submodule .example2. (.*) unregistered for path .example2" actual &&
1208 test_i18ngrep "Cleared directory .init" actual &&
1209 git submodule deinit . >actual &&
1210 test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
1211 test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
1212 test_i18ngrep "Cleared directory .init" actual &&
1213 git submodule deinit --all >actual &&
1214 test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
1215 test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
1216 test_i18ngrep "Cleared directory .init" actual &&
1220 test_expect_success
'submodule deinit absorbs .git directory if .git is a directory' '
1221 git submodule update --init &&
1225 mv ../.git/modules/example .git &&
1226 GIT_WORK_TREE=. git config --unset core.worktree
1228 git submodule deinit init &&
1229 test_path_is_missing init/.git &&
1230 test -z "$(git config --get-regexp "submodule\.example\.")"
1233 test_expect_success
'submodule with UTF-8 name' '
1234 svname=$(printf "\303\245 \303\244\303\266") &&
1241 git commit -m "init sub"
1243 git submodule add ./"$svname" &&
1244 git submodule >&2 &&
1245 test -n "$(git submodule | grep "$svname")"
1248 test_expect_success
'submodule add clone shallow submodule' '
1254 git submodule add --depth=1 file://"$pwd"/example2 submodule &&
1257 test 1 = $(git log --oneline | wc -l)
1262 test_expect_success
'setup superproject with submodules' '
1264 test_commit -C sub1 test &&
1265 test_commit -C sub1 test2 &&
1266 git init multisuper &&
1267 git -C multisuper submodule add ../sub1 sub0 &&
1268 git -C multisuper submodule add ../sub1 sub1 &&
1269 git -C multisuper submodule add ../sub1 sub2 &&
1270 git -C multisuper submodule add ../sub1 sub3 &&
1271 git -C multisuper commit -m "add some submodules"
1281 test_expect_success
'submodule update --init with a specification' '
1282 test_when_finished "rm -rf multisuper_clone" &&
1284 git clone file://"$pwd"/multisuper multisuper_clone &&
1285 git -C multisuper_clone submodule update --init . ":(exclude)sub0" &&
1286 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
1287 test_cmp expect actual
1290 test_expect_success
'submodule update --init with submodule.active set' '
1291 test_when_finished "rm -rf multisuper_clone" &&
1293 git clone file://"$pwd"/multisuper multisuper_clone &&
1294 git -C multisuper_clone config submodule.active "." &&
1295 git -C multisuper_clone config --add submodule.active ":(exclude)sub0" &&
1296 git -C multisuper_clone submodule update --init &&
1297 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
1298 test_cmp expect actual
1301 test_expect_success
'submodule update and setting submodule.<name>.active' '
1302 test_when_finished "rm -rf multisuper_clone" &&
1304 git clone file://"$pwd"/multisuper multisuper_clone &&
1305 git -C multisuper_clone config --bool submodule.sub0.active "true" &&
1306 git -C multisuper_clone config --bool submodule.sub1.active "false" &&
1307 git -C multisuper_clone config --bool submodule.sub2.active "true" &&
1309 cat >expect <<-\EOF &&
1315 git -C multisuper_clone submodule update &&
1316 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
1317 test_cmp expect actual
1320 test_expect_success
'clone active submodule without submodule url set' '
1321 test_when_finished "rm -rf test/test" &&
1323 # another dir breaks accidental relative paths still being correct
1324 git clone file://"$pwd"/multisuper test/test &&
1327 git config submodule.active "." &&
1329 # do not pass --init flag, as the submodule is already active:
1330 git submodule update &&
1331 git submodule status >actual_raw &&
1333 cut -d" " -f3- actual_raw >actual &&
1334 cat >expect <<-\EOF &&
1340 test_cmp expect actual
1344 test_expect_success
'clone --recurse-submodules with a pathspec works' '
1345 test_when_finished "rm -rf multisuper_clone" &&
1346 cat >expected <<-\EOF &&
1353 git clone --recurse-submodules="sub0" multisuper multisuper_clone &&
1354 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
1355 test_cmp expected actual
1358 test_expect_success
'clone with multiple --recurse-submodules options' '
1359 test_when_finished "rm -rf multisuper_clone" &&
1360 cat >expect <<-\EOF &&
1367 git clone --recurse-submodules="." \
1368 --recurse-submodules=":(exclude)sub0" \
1369 --recurse-submodules=":(exclude)sub2" \
1370 multisuper multisuper_clone &&
1371 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
1372 test_cmp expect actual
1375 test_expect_success
'clone and subsequent updates correctly auto-initialize submodules' '
1376 test_when_finished "rm -rf multisuper_clone" &&
1377 cat <<-\EOF >expect &&
1384 cat <<-\EOF >expect2 &&
1393 git clone --recurse-submodules="." \
1394 --recurse-submodules=":(exclude)sub0" \
1395 --recurse-submodules=":(exclude)sub2" \
1396 --recurse-submodules=":(exclude)sub4" \
1397 multisuper multisuper_clone &&
1399 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
1400 test_cmp expect actual &&
1402 git -C multisuper submodule add ../sub1 sub4 &&
1403 git -C multisuper submodule add ../sub1 sub5 &&
1404 git -C multisuper commit -m "add more submodules" &&
1405 # obtain the new superproject
1406 git -C multisuper_clone pull &&
1407 git -C multisuper_clone submodule update --init &&
1408 git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
1409 test_cmp expect2 actual
1412 test_expect_success
'init properly sets the config' '
1413 test_when_finished "rm -rf multisuper_clone" &&
1414 git clone --recurse-submodules="." \
1415 --recurse-submodules=":(exclude)sub0" \
1416 multisuper multisuper_clone &&
1418 git -C multisuper_clone submodule init -- sub0 sub1 &&
1419 git -C multisuper_clone config --get submodule.sub0.active &&
1420 test_must_fail git -C multisuper_clone config --get submodule.sub1.active
1423 test_expect_success
'recursive clone respects -q' '
1424 test_when_finished "rm -rf multisuper_clone" &&
1425 git clone -q --recurse-submodules multisuper multisuper_clone >actual &&
1426 test_must_be_empty actual