Merge branch 'hv/submodule-config'
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2015 22:38:52 +0000 (15:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2015 22:38:52 +0000 (15:38 -0700)
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

1  2 
.gitignore
Makefile
builtin/checkout.c
builtin/fetch.c
diff.c
submodule.c
diff --cc .gitignore
Simple merge
diff --cc Makefile
index 34101e252bcf80cbf151b58e359e604ad2ec365d,5d9a63fb3c73e55d7823b6d475bf9cdacab65234..e326fa09c0ac3f1b8700495ea7a1bf007aa170d6
+++ 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
index 52d59eba80048f507267002a6a88135ca46376b8,f1f168d2f60ab76a10641b57d9c0834f03a228a0..bc703c0f5ed9644b2380ed1f2e20b47238c80e5a
  #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>"),
diff --cc builtin/fetch.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc submodule.c
Simple merge