[PATCH 23/32] split-index: do not invalidate cache-tree at read time
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Apr 28, 2014, 10:55 UTC
- Message-ID
- <1398682553-11634-24-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1398682553-11634-1-git-send-email-pclouds@gmail.com>
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> --- cache.h | 1 + read-cache.c | 3 ++- split-index.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/cache.h b/cache.h index 127804e..be95b84 100644 --- a/cache.h +++ b/cache.h @@ -488,6 +488,7 @@ extern int index_name_pos(const struct index_state *, const char *name, int name #define ADD_CACHE_SKIP_DFCHECK 4 /* Ok to skip DF conflict checks */ #define ADD_CACHE_JUST_APPEND 8 /* Append only; tree.c::read_tree() */ #define ADD_CACHE_NEW_ONLY 16 /* Do not replace existing ones */ +#define ADD_CACHE_KEEP_CACHE_TREE 32 /* Do not invalidate cache-tree */ extern int add_index_entry(struct index_state *, struct cache_entry *ce, int option); extern void rename_index_entry_at(struct index_state *, int pos, const char *new_name); extern int remove_index_entry_at(struct index_state *, int pos); diff --git a/read-cache.c b/read-cache.c index a5517bf..43a61d3 100644 --- a/read-cache.c +++ b/read-cache.c @@ -950,7 +950,8 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; int new_only = option & ADD_CACHE_NEW_ONLY; - cache_tree_invalidate_path(istate, ce->name); + if (!(option & ADD_CACHE_KEEP_CACHE_TREE)) + cache_tree_invalidate_path(istate, ce->name); pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce)); /* existing match? Just replace it. */ diff --git a/split-index.c b/split-index.c index b03a250..33c0c4b 100644 --- a/split-index.c +++ b/split-index.c @@ -133,6 +133,7 @@ void merge_base_index(struct index_state *istate) for (i = si->nr_replacements; i < si->saved_cache_nr; i++) { add_index_entry(istate, si->saved_cache[i], ADD_CACHE_OK_TO_ADD | + ADD_CACHE_KEEP_CACHE_TREE | /* * we may have to replay what * merge-recursive.c:update_stages()
-- 1.9.1.346.ga2b5940