From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Jun 2017 20:47:07 +0000 (-0700)
Subject: Merge branch 'sb/submodule-blanket-recursive'
X-Git-Tag: v2.14.0-rc0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c548de3788eda31388b435d8983866fe43e032f;p=thirdparty%2Fgit.git

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
---

3c548de3788eda31388b435d8983866fe43e032f
diff --cc builtin/read-tree.c
index 78d3193659,7fd55140db..5bfd4c9f76
--- a/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 t/t2013-checkout-submodule.sh
index aa35223369,c962a02277..6ef15738e4
--- a/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"