diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-09 14:21:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-09 14:21:01 -0800 |
| commit | 1b82b936e30cc159afd56bbd39fe632008969773 (patch) | |
| tree | 98a14caeb5258b5cd5889f590da234f6616dc690 /read-cache.c | |
| parent | d991df4bf6259bc53223feb71957c961b7b8fa84 (diff) | |
| parent | 451b66c533b9ede47951d16c0127ab33372125ca (diff) | |
| download | git-1b82b936e30cc159afd56bbd39fe632008969773.tar.gz | |
Merge branch 'js/sparse-vs-split-index'
Mark in various places in the code that the sparse index and the
split index features are mutually incompatible.
* js/sparse-vs-split-index:
split-index: it really is incompatible with the sparse index
t1091: disable split index
sparse-index: sparse index is disallowed when split index is active
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c index eeb1c9e8f7..63a792e578 100644 --- a/read-cache.c +++ b/read-cache.c @@ -3010,6 +3010,9 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile, !is_null_oid(&istate->split_index->base_oid)) { struct strbuf sb = STRBUF_INIT; + if (istate->sparse_index) + die(_("cannot write split index for a sparse index")); + err = write_link_extension(&sb, istate) < 0 || write_index_ext_header(f, eoie_c, CACHE_EXT_LINK, sb.len) < 0; |