From: Jeff Hostetler Date: Thu, 26 May 2022 21:47:05 +0000 (+0000) Subject: unpack-trees: initialize fsmonitor_has_run_once in o->result X-Git-Tag: v2.37.0-rc0~15^2~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9968ed73ff8bf00d06862e6653451faeb008afef;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/unpack-trees.c b/unpack-trees.c index 360844bda3..888cff81f9 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1772,6 +1772,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