summaryrefslogtreecommitdiffstats
path: root/ident.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-24 23:28:40 +0200
committerJunio C Hamano <gitster@pobox.com>2017-06-24 23:28:41 +0200
commitf31d23a399d557d687266b4375a0436f920cc051 (patch)
tree4f163d684ab6b66476e8795a7ea4fce4f2aa5037 /ident.c
parentMerge branch 'bw/ls-files-sans-the-index' (diff)
parentconfig: don't implicitly use gitdir or commondir (diff)
downloadgit-f31d23a399d557d687266b4375a0436f920cc051.tar.xz
git-f31d23a399d557d687266b4375a0436f920cc051.zip
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 'ident.c')
-rw-r--r--ident.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ident.c b/ident.c
index 91c7609055..327abe557f 100644
--- a/ident.c
+++ b/ident.c
@@ -6,6 +6,7 @@
* Copyright (C) 2005 Linus Torvalds
*/
#include "cache.h"
+#include "config.h"
static struct strbuf git_default_name = STRBUF_INIT;
static struct strbuf git_default_email = STRBUF_INIT;