Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
split-index: the reading part
[gitweb.git]
/
read-cache.c
diff --git
a/read-cache.c
b/read-cache.c
index 7966fb7e02471648cbdcd61e945c07dc7502a490..1a7ef7f7835186cead47fcaf8ee467394bc5f334 100644
(file)
--- 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);