diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-13 13:47:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-13 13:47:07 -0700 |
| commit | 3c548de3788eda31388b435d8983866fe43e032f (patch) | |
| tree | ebc1325a891abcf3fac7dcdf04c86c077a1d76a4 /t/t1013-read-tree-submodule.sh | |
| parent | 93dd544f54ea596e9d70d06c100123c10689861c (diff) | |
| parent | 58f4203e7db265cd2d8315ca5d9c9979cd577427 (diff) | |
| download | git-3c548de3788eda31388b435d8983866fe43e032f.tar.gz git-3c548de3788eda31388b435d8983866fe43e032f.tar.xz | |
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/t1013-read-tree-submodule.sh')
| -rwxr-xr-x | t/t1013-read-tree-submodule.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1013-read-tree-submodule.sh b/t/t1013-read-tree-submodule.sh index 7019d0a04..91a6fafcb 100755 --- a/t/t1013-read-tree-submodule.sh +++ b/t/t1013-read-tree-submodule.sh @@ -8,9 +8,9 @@ test_description='read-tree can handle submodules' KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1 KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1 -test_submodule_switch_recursing "git read-tree --recurse-submodules -u -m" +test_submodule_switch_recursing_with_args "read-tree -u -m" -test_submodule_forced_switch_recursing "git read-tree --recurse-submodules -u --reset" +test_submodule_forced_switch_recursing_with_args "read-tree -u --reset" test_submodule_switch "git read-tree -u -m" |