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

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/fetch.c
Simple merge

diff --cc builtin/grep.c
Simple merge

diff --cc builtin/read-tree.c
index 78d3193659e06b4969324153689f219f1cd1c1b3,7fd55140db6423f77237bed70b53a6acd4ef7064..5bfd4c9f76d84c177b72a8ed97d3418d111583e9
--- 1/builtin/read-tree.c
--- 2/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@@ -21,9 -21,8 +21,8 @@@
  static int nr_trees;
  static int read_empty;
  static struct tree *trees[MAX_UNPACK_TREES];
- static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
  
 -static int list_tree(unsigned char *sha1)
 +static int list_tree(struct object_id *oid)
  {
        struct tree *tree;
  

diff --cc builtin/reset.c
Simple merge

diff --cc submodule.c
Simple merge

diff --cc submodule.h
Simple merge

diff --cc t/lib-submodule-update.sh
Simple merge

diff --cc t/t1013-read-tree-submodule.sh
Simple merge

diff --cc t/t2013-checkout-submodule.sh
index aa3522336966749fbea6e8dbe6d8f32cf711a021,c962a02277943256254278ede8f03e623595de6e..6ef15738e44ed8ad82960c042b3212fce266ec93
--- 1/t/t2013-checkout-submodule.sh
--- 2/t/t2013-checkout-submodule.sh
+++ b/t/t2013-checkout-submodule.sh
@@@ -64,9 -64,10 +64,9 @@@ test_expect_success '"checkout <submodu
  '
  
  KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
- test_submodule_switch_recursing "git checkout --recurse-submodules"
 -KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED=1
+ 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"
  

diff --cc t/t5531-deep-submodule-push.sh
Simple merge