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

diff --git a/sha1_file.c b/sha1_file.c
index feb227a8377cd3ca5fb524fd04ebccb713dede4b..a900b280428fa4931b1a60a9ac788edaff89634e 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -7,6 +7,7 @@
  * creation etc.
  */
 #include "cache.h"
+#include "config.h"
 #include "string-list.h"
 #include "lockfile.h"
 #include "delta.h"