summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Derrick Stolee <dstolee@microsoft.com>2021-07-14 13:12:39 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-14 13:42:49 -0700
commitf8fe49e53958f19b0e62e9549a80fcaa56d2f3cf (patch)
tree79898035fb5a4f14216204fd0e984754a23bacea /builtin/merge-tree.c
parentwt-status: expand added sparse directory entries (diff)
downloadtgif-f8fe49e53958f19b0e62e9549a80fcaa56d2f3cf.tar.xz
fsmonitor: integrate with sparse index
If we need to expand a sparse-index into a full one, then the FS Monitor bitmap is going to be incorrect. Ensure that we start fresh at such an event. While this is currently a performance drawback, the eventual hope of the sparse-index feature is that these expansions will be rare and hence we will be able to keep the FS Monitor data accurate across multiple Git commands. These tests are added to demonstrate that the behavior is the same across a full index and a sparse index, but also that file modifications to a tracked directory outside of the sparse cone will trigger ensure_full_index(). Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions