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 /split-index.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 'split-index.c')
| -rw-r--r-- | split-index.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/split-index.c b/split-index.c index 2bb5d556f0..b36c73b3aa 100644 --- a/split-index.c +++ b/split-index.c @@ -100,3 +100,18 @@ void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce else free(ce); } + +void replace_index_entry_in_base(struct index_state *istate, + struct cache_entry *old, + struct cache_entry *new) +{ + if (old->index && + istate->split_index && + istate->split_index->base && + old->index <= istate->split_index->base->cache_nr) { + new->index = old->index; + if (old != istate->split_index->base->cache[new->index - 1]) + free(istate->split_index->base->cache[new->index - 1]); + istate->split_index->base->cache[new->index - 1] = new; + } +} |