From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 31 Aug 2015 22:38:52 +0000 (-0700)
Subject: Merge branch 'hv/submodule-config'
X-Git-Tag: v2.6.0-rc0~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5a4f07b32207044eb8380f2893f807cc8ab9d58f

Merge branch 'hv/submodule-config'

The gitmodules API accessed from the C code learned to cache stuff
lazily.

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

5a4f07b32207044eb8380f2893f807cc8ab9d58f
diff --cc Makefile
index 34101e252b,5d9a63fb3c..e326fa09c0
--- a/Makefile
+++ b/Makefile
@@@ -784,9 -785,9 +785,10 @@@ LIB_OBJS += strbuf.
  LIB_OBJS += streaming.o
  LIB_OBJS += string-list.o
  LIB_OBJS += submodule.o
+ LIB_OBJS += submodule-config.o
  LIB_OBJS += symlinks.o
  LIB_OBJS += tag.o
 +LIB_OBJS += tempfile.o
  LIB_OBJS += trace.o
  LIB_OBJS += trailer.o
  LIB_OBJS += transport.o
diff --cc builtin/checkout.c
index 52d59eba80,f1f168d2f6..bc703c0f5e
--- 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>"),