Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
split-index: do not invalidate cache-tree at read time
[gitweb.git]
/
split-index.c
diff --git
a/split-index.c
b/split-index.c
index b03a250e7cb9072aae525e646184239111f09c3f..33c0c4b6983f29bf29a4bcca9706180bd32b59ff 100644
(file)
--- 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()