fsmonitor: simplify determining the git worktree under Windows

diff --git a/entry.c b/entry.c
index 1d1a09f47e80ce0eb454fbe86ab44948fac597a0..3a7b6673738302e2c549053b024e31ab9f8df56c 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -4,6 +4,7 @@
 #include "streaming.h"
 #include "submodule.h"
 #include "progress.h"
+#include "fsmonitor.h"
 
 static void create_directories(const char *path, int path_len,
                               const struct checkout *state)
@@ -173,8 +174,7 @@ int finish_delayed_checkout(struct checkout *state)
 
        dco->state = CE_RETRY;
        delayed_object_count = dco->paths.nr;
-       progress = start_progress_delay(
-               _("Filtering content"), delayed_object_count, 50, 1);
+       progress = start_delayed_progress(_("Filtering content"), delayed_object_count);
        while (dco->filters.nr > 0) {
                for_each_string_list_item(filter, &dco->filters) {
                        struct string_list available_paths = STRING_LIST_INIT_NODUP;
@@ -358,6 +358,7 @@ static int write_entry(struct cache_entry *ce,
                        lstat(ce->name, &st);
                fill_stat_cache_info(ce, &st);
                ce->ce_flags |= CE_UPDATE_IN_BASE;
+               mark_fsmonitor_invalid(state->istate, ce);
                state->istate->cache_changed |= CE_ENTRY_CHANGED;
        }
        return 0;