completion: optionally disable checkout DWIM

diff --git a/t/t7413-submodule-is-active.sh b/t/t7413-submodule-is-active.sh
index f18e0c9253390db8e623476c78928f948cb6c9a1..9c785b07ec241440c64beed917ba248b1092b43a 100755 (executable)
--- a/t/t7413-submodule-is-active.sh
+++ b/t/t7413-submodule-is-active.sh
@@ -15,6 +15,12 @@ test_expect_success 'setup' '
        test_commit -C super initial &&
        git -C super submodule add ../sub sub1 &&
        git -C super submodule add ../sub sub2 &&
+
+       # Remove submodule.<name>.active entries in order to test in an
+       # environment where only URLs are present in the conifg
+       git -C super config --unset submodule.sub1.active &&
+       git -C super config --unset submodule.sub2.active &&
+
        git -C super commit -a -m "add 2 submodules at sub{1,2}"
 '
 
@@ -28,4 +34,74 @@ test_expect_success 'is-active works with urls' '
        git -C super submodule--helper is-active sub1
 '
 
+test_expect_success 'is-active works with submodule.<name>.active config' '
+       test_when_finished "git -C super config --unset submodule.sub1.active" &&
+       test_when_finished "git -C super config submodule.sub1.URL ../sub" &&
+
+       git -C super config --bool submodule.sub1.active "false" &&
+       test_must_fail git -C super submodule--helper is-active sub1 &&
+
+       git -C super config --bool submodule.sub1.active "true" &&
+       git -C super config --unset submodule.sub1.URL &&
+       git -C super submodule--helper is-active sub1
+'
+
+test_expect_success 'is-active works with basic submodule.active config' '
+       test_when_finished "git -C super config submodule.sub1.URL ../sub" &&
+       test_when_finished "git -C super config --unset-all submodule.active" &&
+
+       git -C super config --add submodule.active "." &&
+       git -C super config --unset submodule.sub1.URL &&
+
+       git -C super submodule--helper is-active sub1 &&
+       git -C super submodule--helper is-active sub2
+'
+
+test_expect_success 'is-active correctly works with paths that are not submodules' '
+       test_when_finished "git -C super config --unset-all submodule.active" &&
+
+       test_must_fail git -C super submodule--helper is-active not-a-submodule &&
+
+       git -C super config --add submodule.active "." &&
+       test_must_fail git -C super submodule--helper is-active not-a-submodule
+'
+
+test_expect_success 'is-active works with exclusions in submodule.active config' '
+       test_when_finished "git -C super config --unset-all submodule.active" &&
+
+       git -C super config --add submodule.active "." &&
+       git -C super config --add submodule.active ":(exclude)sub1" &&
+
+       test_must_fail git -C super submodule--helper is-active sub1 &&
+       git -C super submodule--helper is-active sub2
+'
+
+test_expect_success 'is-active with submodule.active and submodule.<name>.active' '
+       test_when_finished "git -C super config --unset-all submodule.active" &&
+       test_when_finished "git -C super config --unset submodule.sub1.active" &&
+       test_when_finished "git -C super config --unset submodule.sub2.active" &&
+
+       git -C super config --add submodule.active "sub1" &&
+       git -C super config --bool submodule.sub1.active "false" &&
+       git -C super config --bool submodule.sub2.active "true" &&
+
+       test_must_fail git -C super submodule--helper is-active sub1 &&
+       git -C super submodule--helper is-active sub2
+'
+
+test_expect_success 'is-active, submodule.active and submodule add' '
+       test_when_finished "rm -rf super2" &&
+       git init super2 &&
+       test_commit -C super2 initial &&
+       git -C super2 config --add submodule.active "sub*" &&
+
+       # submodule add should only add submodule.<name>.active
+       # to the config if not matched by the pathspec
+       git -C super2 submodule add ../sub sub1 &&
+       test_must_fail git -C super2 config --get submodule.sub1.active &&
+
+       git -C super2 submodule add ../sub mod &&
+       git -C super2 config --get submodule.mod.active
+'
+
 test_done