diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-13 23:47:07 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-13 23:47:07 +0300 |
| commit | 3c548de3788eda31388b435d8983866fe43e032f (patch) | |
| tree | ebc1325a891abcf3fac7dcdf04c86c077a1d76a4 /t/t2013-checkout-submodule.sh | |
| parent | 93dd544f54ea596e9d70d06c100123c10689861c (diff) | |
| parent | 58f4203e7db265cd2d8315ca5d9c9979cd577427 (diff) | |
Merge branch 'sb/submodule-blanket-recursive'
Many commands learned to pay attention to submodule.recurse
configuration.
* sb/submodule-blanket-recursive:
builtin/fetch.c: respect 'submodule.recurse' option
builtin/push.c: respect 'submodule.recurse' option
builtin/grep.c: respect 'submodule.recurse' option
Introduce 'submodule.recurse' option for worktree manipulators
submodule loading: separate code path for .gitmodules and config overlay
reset/checkout/read-tree: unify config callback for submodule recursion
submodule test invocation: only pass additional arguments
submodule recursing: do not write a config variable twice
Diffstat (limited to 't/t2013-checkout-submodule.sh')
| -rwxr-xr-x | t/t2013-checkout-submodule.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh index aa35223369..6ef15738e4 100755 --- a/t/t2013-checkout-submodule.sh +++ b/t/t2013-checkout-submodule.sh @@ -64,9 +64,9 @@ test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .git/ ' KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1 -test_submodule_switch_recursing "git checkout --recurse-submodules" +test_submodule_switch_recursing_with_args "checkout" -test_submodule_forced_switch_recursing "git checkout -f --recurse-submodules" +test_submodule_forced_switch_recursing_with_args "checkout -f" test_submodule_switch "git checkout" |