split-index: do not invalidate cache-tree at read time
We are sure that after merge_base_index() is done. cache-tree can still be used with the final index. So don't destroy cache tree. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Jun 13, 2014 at 19:19 UTC
ce7c614bceedf0c0169dd5b02cae3e33ee45acdd
3 files changed
+4
-1
cache.h
+1
@@ -488,6 +488,7 @@ extern int index_name_pos(const struct index_state *, const char *name, int name
488
#define ADD_CACHE_SKIP_DFCHECK 4 /* Ok to skip DF conflict checks */
489
#define ADD_CACHE_JUST_APPEND 8 /* Append only; tree.c::read_tree() */
490
#define ADD_CACHE_NEW_ONLY 16 /* Do not replace existing ones */
491
+#define ADD_CACHE_KEEP_CACHE_TREE 32 /* Do not invalidate cache-tree */
492
extern int add_index_entry(struct index_state *, struct cache_entry *ce, int option);
493
extern void rename_index_entry_at(struct index_state *, int pos, const char *new_name);
494
extern int remove_index_entry_at(struct index_state *, int pos);
read-cache.c
+2
-1
@@ -950,7 +950,8 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
950
int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
951
int new_only = option & ADD_CACHE_NEW_ONLY;
952
953
- cache_tree_invalidate_path(istate, ce->name);
953
+ if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
954
+ cache_tree_invalidate_path(istate, ce->name);
955
pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
956
957
/* existing match? Just replace it. */
split-index.c
+1
@@ -133,6 +133,7 @@ void merge_base_index(struct index_state *istate)
133
for (i = si->nr_replacements; i < si->saved_cache_nr; i++) {
134
add_index_entry(istate, si->saved_cache[i],
135
ADD_CACHE_OK_TO_ADD |
136
+ ADD_CACHE_KEEP_CACHE_TREE |
137
/*
138
* we may have to replay what
139
* merge-recursive.c:update_stages()