Merge branch 'maint'

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 27050e7c1627ed2899963fb3fdb81a7ba95d06df..e1ba4dc697abd1b2582713744c5a1892ef4a4882 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "builtin.h"
 #include "pack.h"
 #include "refs.h"
 #include "pkt-line.h"