diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-06-13 12:19:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-13 18:49:41 (GMT) |
| commit | ce7c614bceedf0c0169dd5b02cae3e33ee45acdd (patch) | |
| tree | f4299db57da7bafc4d38a6b3d0bea85cb214b4c7 /split-index.c | |
| parent | 76b07b37a3fff15ce4852bd070a610b651c42e77 (diff) | |
| download | git-ce7c614bceedf0c0169dd5b02cae3e33ee45acdd.zip git-ce7c614bceedf0c0169dd5b02cae3e33ee45acdd.tar.gz git-ce7c614bceedf0c0169dd5b02cae3e33ee45acdd.tar.bz2 | |
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>
Diffstat (limited to 'split-index.c')
| -rw-r--r-- | split-index.c | 1 |
1 files changed, 1 insertions, 0 deletions
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() |