diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2017-05-05 16:57:12 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 03:50:20 +0200 |
| commit | f9d7abec2ad2f9eb3d8873169cc28c34273df082 (patch) | |
| tree | 8ac02895a20ac3928aa40fbc1d5e2c58ba47bb8e /read-cache.c | |
| parent | Git 2.13-rc2 (diff) | |
| download | git-f9d7abec2ad2f9eb3d8873169cc28c34273df082.tar.xz git-f9d7abec2ad2f9eb3d8873169cc28c34273df082.zip | |
split-index: add and use unshare_split_index()
When split-index is being used, we have two cache_entry arrays in
index_state->cache[] and index_state->split_index->base->cache[].
index_state->cache[] may share the same entries with base->cache[] so
we can quickly determine what entries are shared. This makes memory
management tricky, we can't free base->cache[] until we know
index_state->cache[] does not point to any of those entries.
unshare_split_index() is added for this purpose, to find shared
entries and either duplicate them in index_state->cache[], or discard
them. Either way it should be safe to free base->cache[] after
unshare_split_index().
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 'read-cache.c')
| -rw-r--r-- | read-cache.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/read-cache.c b/read-cache.c index 0d0081a11b..8da84ae2d1 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1877,15 +1877,9 @@ int discard_index(struct index_state *istate) { int i; - for (i = 0; i < istate->cache_nr; i++) { - if (istate->cache[i]->index && - istate->split_index && - istate->split_index->base && - istate->cache[i]->index <= istate->split_index->base->cache_nr && - istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1]) - continue; + unshare_split_index(istate, 1); + for (i = 0; i < istate->cache_nr; i++) free(istate->cache[i]); - } resolve_undo_clear_index(istate); istate->cache_nr = 0; istate->cache_changed = 0; |