From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 24 Jun 2017 21:28:40 +0000 (-0700)
Subject: Merge branch 'bw/config-h'
X-Git-Tag: v2.14.0-rc0~59
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f31d23a399d557d687266b4375a0436f920cc051

Merge branch 'bw/config-h'

Fix configuration codepath to pay proper attention to commondir
that is used in multi-worktree situation, and isolate config API
into its own header file.

* bw/config-h:
config: don't implicitly use gitdir or commondir
config: respect commondir
setup: teach discover_git_directory to respect the commondir
config: don't include config.h by default
config: remove git_config_iter
config: create config.h
---

f31d23a399d557d687266b4375a0436f920cc051
diff --cc builtin/blame.c
index 749ad7f05b,1a7371808a..bda1a78726
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@@ -6,13 -6,22 +6,14 @@@
   */
  
  #include "cache.h"
+ #include "config.h"
 -#include "refs.h"
  #include "builtin.h"
 -#include "blob.h"
  #include "commit.h"
 -#include "tag.h"
 -#include "tree-walk.h"
  #include "diff.h"
 -#include "diffcore.h"
  #include "revision.h"
  #include "quote.h"
 -#include "xdiff-interface.h"
 -#include "cache-tree.h"
  #include "string-list.h"
  #include "mailmap.h"
 -#include "mergesort.h"
  #include "parse-options.h"
  #include "prio-queue.h"
  #include "utf8.h"
diff --cc builtin/cat-file.c
index 4bffd7a2d8,12451205cf..7efbc4019a
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@@ -4,8 -4,8 +4,9 @@@
   * Copyright (C) Linus Torvalds, 2005
   */
  #include "cache.h"
+ #include "config.h"
  #include "builtin.h"
 +#include "diff.h"
  #include "parse-options.h"
  #include "userdiff.h"
  #include "streaming.h"
diff --cc convert.c
index 4097f521f2,69f23cfcaa..7d2a519daf
--- a/convert.c
+++ b/convert.c
@@@ -1,5 -1,5 +1,6 @@@
 +#define NO_THE_INDEX_COMPATIBILITY_MACROS
  #include "cache.h"
+ #include "config.h"
  #include "attr.h"
  #include "run-command.h"
  #include "quote.h"
diff --cc dir.c
index 6687d84dbc,42beb65bea..f6795473f7
--- a/dir.c
+++ b/dir.c
@@@ -7,8 -7,8 +7,9 @@@
   * Copyright (C) Linus Torvalds, 2005-2006
   *		 Junio Hamano, 2005-2006
   */
 +#define NO_THE_INDEX_COMPATIBILITY_MACROS
  #include "cache.h"
+ #include "config.h"
  #include "dir.h"
  #include "attr.h"
  #include "refs.h"
diff --cc help.c
index 5cdfac7dc2,b8f3a98e4c..8ba0777410
--- a/help.c
+++ b/help.c
@@@ -1,7 -1,7 +1,8 @@@
  #include "cache.h"
+ #include "config.h"
  #include "builtin.h"
  #include "exec_cmd.h"
 +#include "run-command.h"
  #include "levenshtein.h"
  #include "help.h"
  #include "common-cmds.h"
diff --cc pathspec.c
index 828405021f,e4659b1440..ecc5331c23
--- a/pathspec.c
+++ b/pathspec.c
@@@ -1,5 -1,5 +1,6 @@@
 +#define NO_THE_INDEX_COMPATIBILITY_MACROS
  #include "cache.h"
+ #include "config.h"
  #include "dir.h"
  #include "pathspec.h"
  #include "attr.h"