Sync with maint

[thirdparty/git.git] / cache.h

diff --git a/cache.h b/cache.h
index 276d11472bea7c3bb82b27fd8811fbd2b368f76f..cbfaead23a384e780453c948863ef2cf3bef0437 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -304,6 +304,7 @@ static inline unsigned int canon_mode(unsigned int mode)
 
 struct split_index;
 struct untracked_cache;
+struct progress;
 
 struct index_state {
        struct cache_entry **cache;
@@ -326,6 +327,7 @@ struct index_state {
        uint64_t fsmonitor_last_update;
        struct ewah_bitmap *fsmonitor_dirty;
        struct mem_pool *ce_mem_pool;
+       struct progress *progress;
 };
 
 /* Name hashing */
@@ -951,12 +953,14 @@ extern char *git_replace_ref_base;
 
 extern int fsync_object_files;
 extern int core_preload_index;
-extern int core_apply_sparse_checkout;
 extern int precomposed_unicode;
 extern int protect_hfs;
 extern int protect_ntfs;
 extern const char *core_fsmonitor;
 
+extern int core_apply_sparse_checkout;
+extern int core_sparse_checkout_cone;
+
 /*
  * Include broken refs in all ref iterations, which will
  * generally choke dangerous operations rather than letting