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 /rerere.c | |
parent | 5812b3f73b0d319650032833840278fd556fecf3 (diff) | |
parent | dc8441fdb4598f54865a5c783d1f86c1e0bcb6dc (diff) |
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 'rerere.c')
-rw-r--r-- | rerere.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/rerere.c b/rerere.c index c26c29f87a..829b3b0f08 100644 --- a/rerere.c +++ b/rerere.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "config.h" #include "lockfile.h" #include "string-list.h" #include "rerere.h" |