Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object

diff --git a/branch.c b/branch.c
index 985316eb76505a60bca0aa303322bef35e7defaa..a8a548ccf2870c99bbdbcdc7036003aa648faa0c 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -1,5 +1,6 @@
 #include "git-compat-util.h"
 #include "cache.h"
+#include "config.h"
 #include "branch.h"
 #include "refs.h"
 #include "remote.h"