Merge branch 'jt/subprocess-handshake' into maint

diff --git a/cache.h b/cache.h
index a09a5017fb940a72f7a9a08c6652563b8651f2a8..25c98b68093858e5ffc37fd33cf2efb0b2561ba7 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1500,6 +1500,7 @@ struct checkout {
        struct index_state *istate;
        const char *base_dir;
        int base_dir_len;
+       struct delayed_checkout *delayed_checkout;
        unsigned force:1,
                 quiet:1,
                 not_new:1,
@@ -1509,6 +1510,8 @@ struct checkout {
 
 #define TEMPORARY_FILENAME_LENGTH 25
 extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath);
+extern void enable_delayed_checkout(struct checkout *state);
+extern int finish_delayed_checkout(struct checkout *state);
 
 struct cache_def {
        struct strbuf path;