Merge branch 'ds/close-object-store' into maint

diff --git a/cache.h b/cache.h
index fa8ede9a2d6441842f49740482bb74f6c23c1a5d..3e7cd0b4bc5528d00f3ec01d46db9e8a16d770e3 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -341,7 +341,8 @@ struct index_state {
                 initialized : 1,
                 drop_cache_tree : 1,
                 updated_workdir : 1,
-                updated_skipworktree : 1;
+                updated_skipworktree : 1,
+                fsmonitor_has_run_once : 1;
        struct hashmap name_hash;
        struct hashmap dir_hash;
        struct object_id oid;
@@ -825,7 +826,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st);
 int match_stat_data_racy(const struct index_state *istate,
                         const struct stat_data *sd, struct stat *st);
 
-void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
+void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st);
 
 #define REFRESH_REALLY         0x0001  /* ignore_valid */
 #define REFRESH_UNMERGED       0x0002  /* allow unmerged */
@@ -1758,6 +1759,7 @@ void setup_pager(void);
 int pager_in_use(void);
 extern int pager_use_color;
 int term_columns(void);
+void term_clear_line(void);
 int decimal_width(uintmax_t);
 int check_pager_config(const char *cmd);
 void prepare_pager_args(struct child_process *, const char *pager);