From 76b07b37a3fff15ce4852bd070a610b651c42e77 Mon Sep 17 00:00:00 2001 From: Nguyễn Thái Ngọc Duy Date: Fri, 13 Jun 2014 19:19:41 +0700 Subject: split-index: the reading part MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- read-cache.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'read-cache.c') diff --git a/read-cache.c b/read-cache.c index 7966fb7e02..1a7ef7f783 100644 --- a/read-cache.c +++ b/read-cache.c @@ -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); -- cgit v1.3