Merge branch 'cc/shared-index-permfix'

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 73c81f0cb1ae34169667adc7ee7fc246468e08a4..7efbc4019ac59a16ae4f147889e6f489dac1e661 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -4,7 +4,9 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
+#include "config.h"
 #include "builtin.h"
+#include "diff.h"
 #include "parse-options.h"
 #include "userdiff.h"
 #include "streaming.h"