summaryrefslogtreecommitdiff
path: root/builtin/diff-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:41 (GMT)
commitf31d23a399d557d687266b4375a0436f920cc051 (patch)
tree4f163d684ab6b66476e8795a7ea4fce4f2aa5037 /builtin/diff-files.c
parent5812b3f73b0d319650032833840278fd556fecf3 (diff)
parentdc8441fdb4598f54865a5c783d1f86c1e0bcb6dc (diff)
downloadgit-f31d23a399d557d687266b4375a0436f920cc051.zip
git-f31d23a399d557d687266b4375a0436f920cc051.tar.gz
git-f31d23a399d557d687266b4375a0436f920cc051.tar.bz2
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-files.c')
-rw-r--r--builtin/diff-files.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index c97069a..17bf84d 100644
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -4,6 +4,7 @@
* Copyright (C) Linus Torvalds, 2005
*/
#include "cache.h"
+#include "config.h"
#include "diff.h"
#include "commit.h"
#include "revision.h"