diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-06-13 19:19:39 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-13 11:49:40 -0700 |
| commit | 078a58e825d14987df82af9d19c00ddc8eb82481 (patch) | |
| tree | 751e5532832406e8157d89bc3daa1e8434c5c74c /unpack-trees.c | |
| parent | 045113a53e9e4b2c157040a1b53306d7c932c455 (diff) | |
| download | git-078a58e825d14987df82af9d19c00ddc8eb82481.tar.gz | |
read-cache: mark updated entries for split index
The large part of this patch just follows CE_ENTRY_CHANGED
marks. replace_index_entry() is updated to update
split_index->base->cache[] as well so base->cache[] does not reference
to a freed entry.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index a941f7c33e..4a9cdf2105 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -257,8 +257,10 @@ static int apply_sparse_checkout(struct index_state *istate, ce->ce_flags |= CE_SKIP_WORKTREE; else ce->ce_flags &= ~CE_SKIP_WORKTREE; - if (was_skip_worktree != ce_skip_worktree(ce)) + if (was_skip_worktree != ce_skip_worktree(ce)) { + ce->ce_flags |= CE_UPDATE_IN_BASE; istate->cache_changed |= CE_ENTRY_CHANGED; + } /* * if (!was_skip_worktree && !ce_skip_worktree()) { |