3 # Copyright (c) 2009 Red Hat, Inc.
6 test_description='Test updating submodules
8 This test verifies that "git submodule update" detaches the HEAD of the
9 submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
17 sha_master=$(git rev-list --max-count=1 master)
18 sha_head=$(git rev-list --max-count=1 HEAD)
20 test "$sha_master" = "$sha_head"
24 test_expect_success 'setup a submodule tree' '
28 git commit -m upstream &&
30 git clone super submodule &&
31 git clone super rebasing &&
32 git clone super merging &&
33 git clone super none &&
35 git submodule add ../submodule submodule &&
37 git commit -m "submodule" &&
38 git submodule init submodule
41 echo "line2" > file &&
43 git commit -m "Commit 2"
47 git pull --rebase origin
50 git commit -m "submodule update"
53 git submodule add ../rebasing rebasing &&
55 git commit -m "rebasing"
58 git submodule add ../merging merging &&
60 git commit -m "rebasing"
63 git submodule add ../none none &&
67 git clone . recursivesuper &&
69 git submodule add ../super super
73 test_expect_success 'submodule update detaching the HEAD ' '
74 (cd super/submodule &&
75 git reset --hard HEAD~1
81 git submodule update submodule &&
87 test_expect_success 'submodule update from subdirectory' '
88 (cd super/submodule &&
89 git reset --hard HEAD~1
96 git submodule update ../submodule &&
102 supersha1=$(git -C super rev-parse HEAD)
103 mergingsha1=$(git -C super/merging rev-parse HEAD)
104 nonesha1=$(git -C super/none rev-parse HEAD)
105 rebasingsha1=$(git -C super/rebasing rev-parse HEAD)
106 submodulesha1=$(git -C super/submodule rev-parse HEAD)
110 Submodule path '../super': checked out '$supersha1'
111 Submodule path '../super/merging': checked out '$mergingsha1'
112 Submodule path '../super/none': checked out '$nonesha1'
113 Submodule path '../super/rebasing': checked out '$rebasingsha1'
114 Submodule path '../super/submodule': checked out '$submodulesha1'
118 Submodule 'merging' ($pwd/merging) registered for path '../super/merging'
119 Submodule 'none' ($pwd/none) registered for path '../super/none'
120 Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing'
121 Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule'
122 Cloning into '$pwd/recursivesuper/super/merging'...
124 Cloning into '$pwd/recursivesuper/super/none'...
126 Cloning into '$pwd/recursivesuper/super/rebasing'...
128 Cloning into '$pwd/recursivesuper/super/submodule'...
132 test_expect_success 'submodule update --init --recursive from subdirectory' '
133 git -C recursivesuper/super reset --hard HEAD^ &&
134 (cd recursivesuper &&
137 git submodule update --init --recursive ../super >../../actual 2>../../actual2
139 test_i18ncmp expect actual &&
140 test_i18ncmp expect2 actual2
144 Submodule 'foo/sub' ($pwd/withsubs/../rebasing) registered for path 'sub'
147 test_expect_success 'submodule update --init from and of subdirectory' '
151 git submodule add "$(pwd)/../rebasing" foo/sub &&
153 git submodule deinit -f sub &&
154 git submodule update --init sub 2>../../actual2
157 test_i18ncmp expect2 actual2
161 test_expect_success 'submodule update does not fetch already present commits' '
163 echo line3 >> file &&
166 git commit -m "upstream line3"
168 (cd super/submodule &&
169 head=$(git rev-parse --verify HEAD) &&
170 echo "Submodule path ${apos}submodule$apos: checked out $apos$head$apos" > ../../expected &&
171 git reset --hard HEAD~1
174 git submodule update > ../actual 2> ../actual.err
176 test_i18ncmp expected actual &&
180 test_expect_success 'submodule update should fail due to local changes' '
181 (cd super/submodule &&
182 git reset --hard HEAD~1 &&
183 echo "local change" > file
189 test_must_fail git submodule update submodule
192 test_expect_success 'submodule update should throw away changes with --force ' '
197 git submodule update --force submodule &&
203 test_expect_success 'submodule update --force forcibly checks out submodules' '
208 git submodule update --force submodule &&
210 test "$(git status -s file)" = ""
215 test_expect_success 'submodule update --remote should fetch upstream changes' '
217 echo line4 >> file &&
220 git commit -m "upstream line4"
223 git submodule update --remote --force submodule &&
225 test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline)"
229 test_expect_success 'submodule update --remote should fetch upstream changes with .' '
232 git config -f .gitmodules submodule."submodule".branch "." &&
233 git add .gitmodules &&
234 git commit -m "submodules: update from the respective superproject branch"
238 echo line4a >> file &&
241 git commit -m "upstream line4a" &&
242 git checkout -b test-branch &&
243 test_commit on-test-branch
247 git submodule update --remote --force submodule &&
248 git -C submodule log -1 --oneline >actual
249 git -C ../submodule log -1 --oneline master >expect
250 test_cmp expect actual &&
251 git checkout -b test-branch &&
252 git submodule update --remote --force submodule &&
253 git -C submodule log -1 --oneline >actual
254 git -C ../submodule log -1 --oneline test-branch >expect
255 test_cmp expect actual &&
256 git checkout master &&
257 git branch -d test-branch &&
258 git reset --hard HEAD^
262 test_expect_success 'local config should override .gitmodules branch' '
264 git checkout test-branch &&
265 echo line5 >> file &&
268 git commit -m "upstream line5" &&
272 git config submodule.submodule.branch test-branch &&
273 git submodule update --remote --force submodule &&
275 test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline test-branch)"
279 test_expect_success 'submodule update --rebase staying on master' '
280 (cd super/submodule &&
287 git submodule update --rebase submodule &&
293 test_expect_success 'submodule update --merge staying on master' '
294 (cd super/submodule &&
295 git reset --hard HEAD~1
301 git submodule update --merge submodule &&
307 test_expect_success 'submodule update - rebase in .git/config' '
309 git config submodule.submodule.update rebase
311 (cd super/submodule &&
312 git reset --hard HEAD~1
318 git submodule update submodule &&
324 test_expect_success 'submodule update - checkout in .git/config but --rebase given' '
326 git config submodule.submodule.update checkout
328 (cd super/submodule &&
329 git reset --hard HEAD~1
335 git submodule update --rebase submodule &&
341 test_expect_success 'submodule update - merge in .git/config' '
343 git config submodule.submodule.update merge
345 (cd super/submodule &&
346 git reset --hard HEAD~1
352 git submodule update submodule &&
358 test_expect_success 'submodule update - checkout in .git/config but --merge given' '
360 git config submodule.submodule.update checkout
362 (cd super/submodule &&
363 git reset --hard HEAD~1
369 git submodule update --merge submodule &&
375 test_expect_success 'submodule update - checkout in .git/config' '
377 git config submodule.submodule.update checkout
379 (cd super/submodule &&
380 git reset --hard HEAD^
386 git submodule update submodule &&
392 test_expect_success 'submodule update - command in .git/config' '
394 git config submodule.submodule.update "!git checkout"
396 (cd super/submodule &&
397 git reset --hard HEAD^
403 git submodule update submodule &&
409 test_expect_success 'submodule update - command in .gitmodules is rejected' '
410 test_when_finished "git -C super reset --hard HEAD^" &&
411 git -C super config -f .gitmodules submodule.submodule.update "!false" &&
412 git -C super commit -a -m "add command to .gitmodules file" &&
413 git -C super/submodule reset --hard $submodulesha1^ &&
414 test_must_fail git -C super submodule update submodule
418 Execution of 'false $submodulesha1' failed in submodule path 'submodule'
421 test_expect_success 'submodule update - command in .git/config catches failure' '
423 git config submodule.submodule.update "!false"
425 (cd super/submodule &&
426 git reset --hard $submodulesha1^
429 test_must_fail git submodule update submodule 2>../actual
431 test_i18ncmp actual expect
435 Execution of 'false $submodulesha1' failed in submodule path '../submodule'
438 test_expect_success 'submodule update - command in .git/config catches failure -- subdirectory' '
440 git config submodule.submodule.update "!false"
442 (cd super/submodule &&
443 git reset --hard $submodulesha1^
446 mkdir tmp && cd tmp &&
447 test_must_fail git submodule update ../submodule 2>../../actual
449 test_i18ncmp actual expect
452 test_expect_success 'submodule update - command run for initial population of submodule' '
453 cat >expect <<-EOF &&
454 Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\''
456 rm -rf super/submodule &&
457 test_must_fail git -C super submodule update 2>actual &&
458 test_i18ncmp expect actual &&
459 git -C super submodule update --checkout
463 Execution of 'false $submodulesha1' failed in submodule path '../super/submodule'
464 Failed to recurse into submodule path '../super'
467 test_expect_success 'recursive submodule update - command in .git/config catches failure -- subdirectory' '
468 (cd recursivesuper &&
469 git submodule update --remote super &&
471 git commit -m "update to latest to have more than one commit in submodules"
473 git -C recursivesuper/super config submodule.submodule.update "!false" &&
474 git -C recursivesuper/super/submodule reset --hard $submodulesha1^ &&
475 (cd recursivesuper &&
476 mkdir -p tmp && cd tmp &&
477 test_must_fail git submodule update --recursive ../super 2>../../actual
479 test_i18ncmp actual expect
482 test_expect_success 'submodule init does not copy command into .git/config' '
483 test_when_finished "git -C super update-index --force-remove submodule1" &&
484 test_when_finished git config -f super/.gitmodules \
485 --remove-section submodule.submodule1 &&
487 H=$(git ls-files -s submodule | cut -d" " -f2) &&
489 git update-index --add --cacheinfo 160000 $H submodule1 &&
490 git config -f .gitmodules submodule.submodule1.path submodule1 &&
491 git config -f .gitmodules submodule.submodule1.url ../submodule &&
492 git config -f .gitmodules submodule.submodule1.update !false &&
493 test_must_fail git submodule init submodule1 &&
494 test_expect_code 1 git config submodule.submodule1.update >actual &&
495 test_must_be_empty actual
499 test_expect_success 'submodule init picks up rebase' '
501 git config -f .gitmodules submodule.rebasing.update rebase &&
502 git submodule init rebasing &&
503 test "rebase" = "$(git config submodule.rebasing.update)"
507 test_expect_success 'submodule init picks up merge' '
509 git config -f .gitmodules submodule.merging.update merge &&
510 git submodule init merging &&
511 test "merge" = "$(git config submodule.merging.update)"
515 test_expect_success 'submodule update --merge - ignores --merge for new submodules' '
516 test_config -C super submodule.submodule.update checkout &&
519 git submodule update submodule &&
520 git status -s submodule >expect &&
522 git submodule update --merge submodule &&
523 git status -s submodule >actual &&
524 test_cmp expect actual
528 test_expect_success 'submodule update --rebase - ignores --rebase for new submodules' '
529 test_config -C super submodule.submodule.update checkout &&
532 git submodule update submodule &&
533 git status -s submodule >expect &&
535 git submodule update --rebase submodule &&
536 git status -s submodule >actual &&
537 test_cmp expect actual
541 test_expect_success 'submodule update ignores update=merge config for new submodules' '
544 git submodule update submodule &&
545 git status -s submodule >expect &&
547 git config submodule.submodule.update merge &&
548 git submodule update submodule &&
549 git status -s submodule >actual &&
550 git config --unset submodule.submodule.update &&
551 test_cmp expect actual
555 test_expect_success 'submodule update ignores update=rebase config for new submodules' '
558 git submodule update submodule &&
559 git status -s submodule >expect &&
561 git config submodule.submodule.update rebase &&
562 git submodule update submodule &&
563 git status -s submodule >actual &&
564 git config --unset submodule.submodule.update &&
565 test_cmp expect actual
569 test_expect_success 'submodule init picks up update=none' '
571 git config -f .gitmodules submodule.none.update none &&
572 git submodule init none &&
573 test "none" = "$(git config submodule.none.update)"
577 test_expect_success 'submodule update - update=none in .git/config' '
579 git config submodule.submodule.update none &&
581 git checkout master &&
584 git diff --raw | grep " submodule" &&
585 git submodule update &&
586 git diff --raw | grep " submodule" &&
590 git config --unset submodule.submodule.update &&
591 git submodule update submodule
595 test_expect_success 'submodule update - update=none in .git/config but --checkout given' '
597 git config submodule.submodule.update none &&
599 git checkout master &&
602 git diff --raw | grep " submodule" &&
603 git submodule update --checkout &&
604 test_must_fail git diff --raw \| grep " submodule" &&
606 test_must_fail compare_head
608 git config --unset submodule.submodule.update
612 test_expect_success 'submodule update --init skips submodule with update=none' '
614 git add .gitmodules &&
615 git commit -m ".gitmodules"
617 git clone super cloned &&
619 git submodule update --init &&
620 test -e submodule/.git &&
621 test_must_fail test -e none/.git
625 test_expect_success 'submodule update continues after checkout error' '
627 git reset --hard HEAD &&
628 git submodule add ../submodule submodule2 &&
629 git submodule init &&
630 git commit -am "new_submodule" &&
632 git rev-parse --verify HEAD >../expect
635 test_commit "update_submodule" file
638 test_commit "update_submodule2" file
641 git add submodule2 &&
642 git commit -m "two_new_submodule_commits" &&
646 git checkout HEAD^ &&
647 test_must_fail git submodule update &&
649 git rev-parse --verify HEAD >../actual
651 test_cmp expect actual
654 test_expect_success 'submodule update continues after recursive checkout error' '
656 git reset --hard HEAD &&
657 git checkout master &&
658 git submodule update &&
660 git submodule add ../submodule subsubmodule &&
661 git submodule init &&
662 git commit -m "new_subsubmodule"
665 git commit -m "update_submodule" &&
668 test_commit "update_subsubmodule" file
670 git add subsubmodule &&
671 test_commit "update_submodule_again" file &&
673 test_commit "update_subsubmodule_again" file
675 test_commit "update_submodule_again_again" file
678 git rev-parse --verify HEAD >../expect &&
679 test_commit "update_submodule2_again" file
682 git add submodule2 &&
683 git commit -m "new_commits" &&
684 git checkout HEAD^ &&
686 git checkout HEAD^ &&
691 test_must_fail git submodule update --recursive &&
693 git rev-parse --verify HEAD >../actual
695 test_cmp expect actual
699 test_expect_success 'submodule update exit immediately in case of merge conflict' '
701 git checkout master &&
702 git reset --hard HEAD &&
705 git reset --hard HEAD
708 git submodule update --recursive &&
710 test_commit "update_submodule_2" file
713 test_commit "update_submodule2_2" file
716 git add submodule2 &&
717 git commit -m "two_new_submodule_commits" &&
719 git checkout master &&
720 test_commit "conflict" file &&
721 echo "conflict" > file
723 git checkout HEAD^ &&
725 git rev-parse --verify HEAD >../expect
727 git config submodule.submodule.update merge &&
728 test_must_fail git submodule update &&
730 git rev-parse --verify HEAD >../actual
732 test_cmp expect actual
736 test_expect_success 'submodule update exit immediately after recursive rebase error' '
738 git checkout master &&
739 git reset --hard HEAD &&
741 git reset --hard HEAD &&
742 git submodule update --recursive
745 test_commit "update_submodule_3" file
748 test_commit "update_submodule2_3" file
751 git add submodule2 &&
752 git commit -m "two_new_submodule_commits" &&
754 git checkout master &&
755 test_commit "conflict2" file &&
756 echo "conflict" > file
758 git checkout HEAD^ &&
760 git rev-parse --verify HEAD >../expect
762 git config submodule.submodule.update rebase &&
763 test_must_fail git submodule update &&
765 git rev-parse --verify HEAD >../actual
767 test_cmp expect actual
771 test_expect_success 'add different submodules to the same path' '
773 git submodule add ../submodule s1 &&
774 test_must_fail git submodule add ../merging s1
778 test_expect_success 'submodule add places git-dir in superprojects git-dir' '
781 git submodule add ../submodule deeper/submodule &&
782 (cd deeper/submodule &&
783 git log > ../../expected
785 (cd .git/modules/deeper/submodule &&
786 git log > ../../../../actual
788 test_cmp actual expected
792 test_expect_success 'submodule update places git-dir in superprojects git-dir' '
794 git commit -m "added submodule"
796 git clone super super2 &&
798 git submodule init deeper/submodule &&
799 git submodule update &&
800 (cd deeper/submodule &&
801 git log > ../../expected
803 (cd .git/modules/deeper/submodule &&
804 git log > ../../../../actual
806 test_cmp actual expected
810 test_expect_success 'submodule add places git-dir in superprojects git-dir recursive' '
812 (cd deeper/submodule &&
813 git submodule add ../submodule subsubmodule &&
815 git log > ../../../expected
817 git commit -m "added subsubmodule" &&
820 (cd .git/modules/deeper/submodule/modules/subsubmodule &&
821 git log > ../../../../../actual
823 git add deeper/submodule &&
824 git commit -m "update submodule" &&
826 test_cmp actual expected
830 test_expect_success 'submodule update places git-dir in superprojects git-dir recursive' '
831 mkdir super_update_r &&
832 (cd super_update_r &&
835 mkdir subsuper_update_r &&
836 (cd subsuper_update_r &&
839 mkdir subsubsuper_update_r &&
840 (cd subsubsuper_update_r &&
843 git clone subsubsuper_update_r subsubsuper_update_r2 &&
844 (cd subsubsuper_update_r2 &&
845 test_commit "update_subsubsuper" file &&
846 git push origin master
848 git clone subsuper_update_r subsuper_update_r2 &&
849 (cd subsuper_update_r2 &&
850 test_commit "update_subsuper" file &&
851 git submodule add ../subsubsuper_update_r subsubmodule &&
852 git commit -am "subsubmodule" &&
853 git push origin master
855 git clone super_update_r super_update_r2 &&
856 (cd super_update_r2 &&
857 test_commit "update_super" file &&
858 git submodule add ../subsuper_update_r submodule &&
859 git commit -am "submodule" &&
860 git push origin master
862 rm -rf super_update_r2 &&
863 git clone super_update_r super_update_r2 &&
864 (cd super_update_r2 &&
865 git submodule update --init --recursive >actual &&
866 test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual &&
867 (cd submodule/subsubmodule &&
868 git log > ../../expected
870 (cd .git/modules/submodule/modules/subsubmodule
871 git log > ../../../../../actual
873 test_cmp actual expected
877 test_expect_success 'submodule add properly re-creates deeper level submodules' '
879 git reset --hard master &&
881 git submodule add --force ../submodule deeper/submodule
885 test_expect_success 'submodule update properly revives a moved submodule' '
887 H=$(git rev-parse --short HEAD) &&
888 git commit -am "pre move" &&
889 H2=$(git rev-parse --short HEAD) &&
890 git status | sed "s/$H/XXX/" >expect &&
891 H=$(cd submodule2; git rev-parse HEAD) &&
892 git rm --cached submodule2 &&
894 mkdir -p "moved/sub module" &&
895 git update-index --add --cacheinfo 160000 $H "moved/sub module" &&
896 git config -f .gitmodules submodule.submodule2.path "moved/sub module"
897 git commit -am "post move" &&
898 git submodule update &&
899 git status | sed "s/$H2/XXX/" >actual &&
900 test_cmp expect actual
904 test_expect_success SYMLINKS 'submodule update can handle symbolic links in pwd' '
905 mkdir -p linked/dir &&
906 ln -s linked/dir linkto &&
908 git clone "$TRASH_DIRECTORY"/super_update_r2 super &&
910 git submodule update --init --recursive
915 test_expect_success 'submodule update clone shallow submodule' '
916 test_when_finished "rm -rf super3" &&
917 first=$(git -C cloned submodule status submodule |cut -c2-41) &&
918 second=$(git -C submodule rev-parse HEAD) &&
919 commit_count=$(git -C submodule rev-list --count $first^..$second) &&
920 git clone cloned super3 &&
924 sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
925 mv -f .gitmodules.tmp .gitmodules &&
926 git submodule update --init --depth=$commit_count &&
927 test 1 = $(git -C submodule log --oneline | wc -l)
931 test_expect_success 'submodule update clone shallow submodule outside of depth' '
932 test_when_finished "rm -rf super3" &&
933 git clone cloned super3 &&
937 sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
938 mv -f .gitmodules.tmp .gitmodules &&
939 test_must_fail git submodule update --init --depth=1 2>actual &&
940 test_i18ngrep "Direct fetching of that commit failed." actual &&
941 git -C ../submodule config uploadpack.allowReachableSHA1InWant true &&
942 git submodule update --init --depth=1 >actual &&
943 test 1 = $(git -C submodule log --oneline | wc -l)
947 test_expect_success 'submodule update --recursive drops module name before recursing' '
949 (cd deeper/submodule/subsubmodule &&
952 git submodule update --recursive deeper/submodule >actual &&
953 test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
957 test_expect_success 'submodule update can be run in parallel' '
959 GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 7 &&
960 grep "7 tasks" trace.out &&
961 git config submodule.fetchJobs 8 &&
962 GIT_TRACE=$(pwd)/trace.out git submodule update &&
963 grep "8 tasks" trace.out &&
964 GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 9 &&
965 grep "9 tasks" trace.out
969 test_expect_success 'git clone passes the parallel jobs config on to submodules' '
970 test_when_finished "rm -rf super4" &&
971 GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 7 . super4 &&
972 grep "7 tasks" trace.out &&
974 git config --global submodule.fetchJobs 8 &&
975 GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules . super4 &&
976 grep "8 tasks" trace.out &&
978 GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 9 . super4 &&
979 grep "9 tasks" trace.out &&