fsmonitor: refactor untracked-cache invalidation
Update fsmonitor_refresh_callback() to use the new untracked_cache_invalidate_trimmed_path() to invalidate the cache using the observed pathname without needing to modify the caller's buffer. Previously, we modified the caller's buffer when the observed pathname contained a trailing slash (and did not restore it). This wasn't a problem for the single use-case caller, but felt dirty nontheless. In a later commit we will want to invalidate case-corrected versions of the pathname (using possibly borrowed pathnames from the name-hash or dir-name-hash) and we may not want to keep the tradition of altering the passed-in pathname. Signed-off-by: Jeff Hostetler <jeffhostetler@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff Hostetler committed
Feb 26, 2024 at 21:39 UTC
48f4cd7155a117b964e446f5c954d1046f2038c0
1 file changed
+3
-8
fsmonitor.c
+3
-8
@@ -271,21 +271,16 @@ static void fsmonitor_refresh_callback(struct index_state *istate, char *name)
271
272
if (name[len - 1] == '/') {
273
handle_path_with_trailing_slash(istate, name, pos);
274
-
275
- /*
276
- * We need to remove the traling "/" from the path
277
- * for the untracked cache.
278
- */
279
- name[len - 1] = '\0';
274
} else {
275
handle_path_without_trailing_slash(istate, name, pos);
276
}
277
278
/*
279
* Mark the untracked cache dirty even if it wasn't found in the index
286
- * as it could be a new untracked file.
280
+ * as it could be a new untracked file. (Let the untracked cache
281
+ * layer silently deal with any trailing slash.)
282
*/
288
- untracked_cache_invalidate_path(istate, name, 0);
283
+ untracked_cache_invalidate_trimmed_path(istate, name, 0);
284
}
285
286
/*