diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:41 -0700 |
| commit | f31d23a399d557d687266b4375a0436f920cc051 (patch) | |
| tree | 4f163d684ab6b66476e8795a7ea4fce4f2aa5037 /builtin/diff-tree.c | |
| parent | Merge branch 'bw/ls-files-sans-the-index' (diff) | |
| parent | config: don't implicitly use gitdir or commondir (diff) | |
| download | tgif-f31d23a399d557d687266b4375a0436f920cc051.tar.xz | |
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
Diffstat (limited to 'builtin/diff-tree.c')
| -rw-r--r-- | builtin/diff-tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index 7e15d01f36..31d2cb4107 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "config.h" #include "diff.h" #include "commit.h" #include "log-tree.h" |