summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-24 14:28:40 -0700
committerJunio C Hamano <gitster@pobox.com>2017-06-24 14:28:41 -0700
commitf31d23a399d557d687266b4375a0436f920cc051 (patch)
tree4f163d684ab6b66476e8795a7ea4fce4f2aa5037 /builtin/fmt-merge-msg.c
parent5812b3f73b0d319650032833840278fd556fecf3 (diff)
parentdc8441fdb4598f54865a5c783d1f86c1e0bcb6dc (diff)
downloadgit-f31d23a399d557d687266b4375a0436f920cc051.tar.gz
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/fmt-merge-msg.c')
-rw-r--r--builtin/fmt-merge-msg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 70137b0b7e..10cbb43416 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -1,5 +1,6 @@
#include "builtin.h"
#include "cache.h"
+#include "config.h"
#include "refs.h"
#include "commit.h"
#include "diff.h"