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

split-index: the reading part

Browse Source 
CE_REMOVE'd entries are removed here because only parts of the code
base (unpack_trees in fact) test this bit when they look for the
presence of an entry. Leaving them may confuse the code ignores this
bit and expects to see a real entry.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2014-06-13 19:19:41 +07:00
committed by Junio C Hamano
parent 96a1d8d34c
commit 76b07b37a3
3 changed files with 84 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
read-cache.c
View File

@ -1569,8 +1569,6 @@ int read_index_from(struct index_state *istate, const char *path)
if (is_null_sha1(split_index->base_sha1))
return ret;
if (istate->cache_nr)
die("index in split-index mode must contain no entries");
if (split_index->base)
discard_index(split_index->base);