summaryrefslogtreecommitdiff
path: root/split-index.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-06-13 12:19:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-13 18:49:40 (GMT)
commit078a58e825d14987df82af9d19c00ddc8eb82481 (patch)
tree751e5532832406e8157d89bc3daa1e8434c5c74c /split-index.c
parent045113a53e9e4b2c157040a1b53306d7c932c455 (diff)
downloadgit-078a58e825d14987df82af9d19c00ddc8eb82481.zip
git-078a58e825d14987df82af9d19c00ddc8eb82481.tar.gz
git-078a58e825d14987df82af9d19c00ddc8eb82481.tar.bz2
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.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/split-index.c b/split-index.c
index 2bb5d55..b36c73b 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;
+ }
+}