mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/split-index-unshare'

Browse Source 
* nd/split-index-unshare:
  Revert "split-index: add and use unshare_split_index()"
This commit is contained in:
Junio C Hamano
2017-06-24 12:04:25 -07:00
parent 5402b1352f 64719b115d
commit 6ba4d62ba8
3 changed files with 21 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
read-cache.c
View File

@ -1877,9 +1877,15 @@ int discard_index(struct index_state *istate)
{
int i;
unshare_split_index(istate, 1);
for (i = 0; i < istate->cache_nr; i++)
for (i = 0; i < istate->cache_nr; i++) {
if (istate->cache[i]->index &&
istate->split_index &&
istate->split_index->base &&
istate->cache[i]->index <= istate->split_index->base->cache_nr &&
istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1])
continue;
free(istate->cache[i]);
}
resolve_undo_clear_index(istate);
istate->cache_nr = 0;
istate->cache_changed = 0;