Merge branch 'maint-1.7.4' into maint-1.7.5

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index fe07bb7ba3fa53bfa49684068781dd693b6ffe1b..c1f6ddd927d61fbc2558ee3624224af405d918c3 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "builtin.h"
 #include "commit.h"
 #include "refs.h"
 #include "pkt-line.h"