diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-06-13 19:19:41 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-13 11:49:40 -0700 |
| commit | 76b07b37a3fff15ce4852bd070a610b651c42e77 (patch) | |
| tree | bbd302d2820b7c3c501b547e0e10a8fcea817d08 /read-cache.c | |
| parent | 96a1d8d34c16be8fc5acd7ceb4d34573d8e2a76b (diff) | |
| download | git-76b07b37a3fff15ce4852bd070a610b651c42e77.tar.gz git-76b07b37a3fff15ce4852bd070a610b651c42e77.tar.xz | |
split-index: the reading part
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>
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/read-cache.c b/read-cache.c index 7966fb7e0..1a7ef7f78 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); |