From 0ec9949f78e348250f55ba0343344ec8c606be11 Mon Sep 17 00:00:00 2001 From: Nipunn Koorapati Date: Wed, 17 Mar 2021 21:22:22 +0000 Subject: fsmonitor: add assertion that fsmonitor is valid to check_removed Validate that fsmonitor is valid to futureproof against bugs where check_removed might be called from places that haven't refreshed. Signed-off-by: Nipunn Koorapati Signed-off-by: Junio C Hamano --- fsmonitor.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'fsmonitor.h') diff --git a/fsmonitor.h b/fsmonitor.h index 7f1794b90b..f20d72631d 100644 --- a/fsmonitor.h +++ b/fsmonitor.h @@ -49,6 +49,17 @@ void refresh_fsmonitor(struct index_state *istate); */ int fsmonitor_is_trivial_response(const struct strbuf *query_result); +/* + * Check if refresh_fsmonitor has been called at least once. + * refresh_fsmonitor is idempotent. Returns true if fsmonitor is + * not enabled (since the state will be "fresh" w/ CE_FSMONITOR_VALID unset) + * This version is useful for assertions + */ +static inline int is_fsmonitor_refreshed(const struct index_state *istate) +{ + return !core_fsmonitor || istate->fsmonitor_has_run_once; +} + /* * Set the given cache entries CE_FSMONITOR_VALID bit. This should be * called any time the cache entry has been updated to reflect the -- cgit v1.2.3