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

unpack-trees: allow sparse directories

Browse Source 
The index_pos_by_traverse_info() currently throws a BUG() when a
directory entry exists exactly in the index. We need to consider that it
is possible to have a directory in a sparse index as long as that entry
is itself marked with the skip-worktree bit.

The 'pos' variable is assigned a negative value if an exact match is not
found. Since a directory name can be an exact match, it is no longer an
error to have a nonnegative 'pos' value.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee
2021-03-30 13:10:57 +00:00
committed by Junio C Hamano
parent f442313e2e
commit 13e1331247
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
unpack-trees.c
View File

@ -746,9 +746,13 @@ static int index_pos_by_traverse_info(struct name_entry *names,
strbuf_make_traverse_path(&name, info, names->path, names->pathlen); strbuf_make_traverse_path(&name, info, names->path, names->pathlen);
strbuf_addch(&name, '/'); strbuf_addch(&name, '/');
pos = index_name_pos(o->src_index, name.buf, name.len); pos = index_name_pos(o->src_index, name.buf, name.len);
if (pos >= 0) if (pos >= 0) {
BUG("This is a directory and should not exist in index"); if (!o->src_index->sparse_index ||
pos = -pos - 1; !(o->src_index->cache[pos]->ce_flags & CE_SKIP_WORKTREE))
BUG("This is a directory and should not exist in index");
} else {
pos = -pos - 1;
}
if (pos >= o->src_index->cache_nr || if (pos >= o->src_index->cache_nr ||
!starts_with(o->src_index->cache[pos]->name, name.buf) || !starts_with(o->src_index->cache[pos]->name, name.buf) ||
(pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name.buf))) (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name.buf)))