t/lib-submodule-update: add test removing nested submodules
The previous commit fixed a bug with the (no submodule) -> (nested submodules) transition for commands in the unpack-trees machinery. Let's add a test for the reverse transition (going from nested submodules to no submodule), as it is not being tested currently. While at it, uniformize the capitalization in the list of tests. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Philippe Blain committed
Feb 17, 2020 at 04:53 UTC
846f34d3514b81764dea7c2a4851f6187ab31aad
1 file changed
+18
-2
t/lib-submodule-update.sh
+18
-2
@@ -297,7 +297,7 @@ test_submodule_content () {
297
# - Directory containing tracked files replaced by submodule
298
# - Submodule replaced by tracked files in directory
299
# - Submodule replaced by tracked file with the same name
300
-# - tracked file replaced by submodule
300
+# - Tracked file replaced by submodule
301
#
302
# The default is that submodule contents aren't changed until "git submodule
303
# update" is run. And even then that command doesn't delete the work tree of
@@ -621,12 +621,13 @@ test_submodule_forced_switch () {
621
# - Directory containing tracked files replaced by submodule
622
# - Submodule replaced by tracked files in directory
623
# - Submodule replaced by tracked file with the same name
624
-# - tracked file replaced by submodule
624
+# - Tracked file replaced by submodule
625
#
626
# New test cases
627
# - Removing a submodule with a git directory absorbs the submodules
628
# git directory first into the superproject.
629
# - Switching from no submodule to nested submodules
630
+# - Switching from nested submodules to no submodule
631
632
# Internal function; use test_submodule_switch_recursing_with_args() or
633
# test_submodule_forced_switch_recursing_with_args() instead.
@@ -760,6 +761,21 @@ test_submodule_recursing_with_args_common() {
761
)
762
'
763
764
+ # Switching to a commit without nested submodules removes their worktrees
765
+ test_expect_success "$command: worktrees of nested submodules are removed" '
766
+ prolog &&
767
+ reset_work_tree_to_interested add_nested_sub &&
768
+ (
769
+ cd submodule_update &&
770
+ git branch -t no_submodule origin/no_submodule &&
771
+ $command no_submodule &&
772
+ test_superproject_content origin/no_submodule &&
773
+ ! test_path_is_dir sub1 &&
774
+ test_must_fail git config -f .git/modules/sub1/config core.worktree &&
775
+ test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
776
+ )
777
+ '
778
+
779
########################## Modified submodule #########################
780
# Updating a submodule sha1 updates the submodule's work tree
781
test_expect_success "$command: modified submodule updates submodule work tree" '