From ea6e532d654166f8adcc4bec7d7a6f052cd0aaff Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Mon, 23 Aug 2021 17:42:28 -0400 Subject: [PATCH] unpack-trees: initialize fsmonitor_has_run_once in o->result Initialize `o->result.fsmonitor_has_run_once` based upon value in `o->src_index->fsmonitor_has_run_once` to prevent a second fsmonitor query during the tree traversal and possibly getting a skewed view of the working directory. The checkout code has already talked to the fsmonitor and the traversal is updating the index as it traverses, so there is no need to query the fsmonitor. Signed-off-by: Jeff Hostetler --- unpack-trees.c | 1 + 1 file changed, 1 insertion(+) diff --git a/unpack-trees.c b/unpack-trees.c index e33e7e953e..a2c5400bd6 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1740,6 +1740,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options o->result.fsmonitor_last_update = xstrdup_or_null(o->src_index->fsmonitor_last_update); + o->result.fsmonitor_has_run_once = o->src_index->fsmonitor_has_run_once; /* * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries