aboutsummaryrefslogtreecommitdiffstats
path: root/unpack-trees.c
diff options
context:
space:
mode:
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index a1d0ff3a4d..d561ca01ed 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -19,6 +19,7 @@
#include "promisor-remote.h"
#include "entry.h"
#include "parallel-checkout.h"
+#include "sparse-index.h"
/*
* Error messages expected by scripts out of plumbing commands such as
@@ -1839,6 +1840,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;
if (!o->src_index->initialized &&
!repo->settings.command_requires_full_index &&
@@ -2024,6 +2026,9 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o)
goto skip_sparse_checkout;
}
+ /* Expand sparse directories as needed */
+ expand_index(o->src_index, o->pl);
+
/* Set NEW_SKIP_WORKTREE on existing entries. */
mark_all_ce_unused(o->src_index);
mark_new_skip_worktree(o->pl, o->src_index, 0,