Merge branch 'jc/pack' into next

diff --git a/cache.h b/cache.h
index 0d3b244ddd52ada5f08fdb495237c1760778a289..1f962809b0be75b83abc285d492b62c7e6426623 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -262,7 +262,7 @@ struct checkout {
                 refresh_cache:1;
 };
 
-extern int checkout_entry(struct cache_entry *ce, struct checkout *state);
+extern int checkout_entry(struct cache_entry *ce, struct checkout *state, char *topath);
 
 extern struct alternate_object_database {
        struct alternate_object_database *next;
@@ -354,4 +354,7 @@ extern int copy_fd(int ifd, int ofd);
 extern int receive_unpack_pack(int fd[2], const char *me, int quiet);
 extern int receive_keep_pack(int fd[2], const char *me, int quiet);
 
+/* pager.c */
+extern void setup_pager(void);
+
 #endif /* CACHE_H */