builtin/branch: stop supporting the "--set-upstream" option

diff --git a/cache.h b/cache.h
index 55eeac8148b0597fd1a539736f4e81908bd96839..1c69d2a05aaf1f5e737bd5229cfaf0fedbe6ca92 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1499,6 +1499,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,
@@ -1508,6 +1509,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;