diff options
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 b03a250e7c..33c0c4b698 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() |