Merge branch 'es/grep-require-name-when-needed' into maint

diff --git a/bulk-checkin.h b/bulk-checkin.h
index a85527318b15b36bb60b0b6b166569b4fcaa9dcf..b26f3dc3b74cb9ccb4ea630fafe8cd0cdcf5a012 100644 (file)
--- a/bulk-checkin.h
+++ b/bulk-checkin.h
@@ -4,11 +4,13 @@
 #ifndef BULK_CHECKIN_H
 #define BULK_CHECKIN_H
 
-extern int index_bulk_checkin(struct object_id *oid,
-                             int fd, size_t size, enum object_type type,
-                             const char *path, unsigned flags);
+#include "cache.h"
 
-extern void plug_bulk_checkin(void);
-extern void unplug_bulk_checkin(void);
+int index_bulk_checkin(struct object_id *oid,
+                      int fd, size_t size, enum object_type type,
+                      const char *path, unsigned flags);
+
+void plug_bulk_checkin(void);
+void unplug_bulk_checkin(void);
 
 #endif