From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Aug 2015 18:44:39 +0000 (-0700)
Subject: Merge 'hv/submodule-config' to 'sb/submodule-helper'
X-Git-Tag: v2.7.0-rc0~136^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a1ba6b48a62bf55f9c8305d9850c3a8d22365c5;p=thirdparty%2Fgit.git

Merge 'hv/submodule-config' to 'sb/submodule-helper'

* hv/submodule-config:
  submodule: allow erroneous values for the fetchRecurseSubmodules option
  submodule: use new config API for worktree configurations
  submodule: extract functions for config set and lookup
  submodule: implement a config API for lookup of .gitmodules values
---

5a1ba6b48a62bf55f9c8305d9850c3a8d22365c5
diff --cc builtin/checkout.c
index 9ff5ca4cbe,f1f168d2f6..7ea533e4ab
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@@ -18,7 -18,10 +18,8 @@@
  #include "xdiff-interface.h"
  #include "ll-merge.h"
  #include "resolve-undo.h"
+ #include "submodule-config.h"
  #include "submodule.h"
 -#include "argv-array.h"
 -#include "sigchain.h"
  
  static const char * const checkout_usage[] = {
  	N_("git checkout [<options>] <branch>"),