diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-08-26 11:13:12 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-08-26 11:13:13 -0700 |
commit | 7be9f3f3353acc1e9478aaed5afe2b0778388a69 (patch) | |
tree | 34f13edbcf701407c834abba4ab944f774c71493 /read-cache.c | |
parent | e5cb51d3aa2e522a571a74a9664a538a40fc7d64 (diff) | |
parent | b15207b8cf1a1930fe5eb076c08c6ddc92d9282d (diff) | |
download | git-7be9f3f3353acc1e9478aaed5afe2b0778388a69.tar.gz |
Merge branch 'vd/sparse-reset-checkout-fixes' into maint
Fixes to sparse index compatibility work for "reset" and "checkout"
commands.
source: <pull.1312.v3.git.1659985672.gitgitgadget@gmail.com>
* vd/sparse-reset-checkout-fixes:
unpack-trees: unpack new trees as sparse directories
cache.h: create 'index_name_pos_sparse()'
oneway_diff: handle removed sparse directories
checkout: fix nested sparse directory diff in sparse index
Diffstat (limited to 'read-cache.c')
-rw-r--r-- | read-cache.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c index 4de207752d..b09128b188 100644 --- a/read-cache.c +++ b/read-cache.c @@ -620,6 +620,11 @@ int index_name_pos(struct index_state *istate, const char *name, int namelen) return index_name_stage_pos(istate, name, namelen, 0, EXPAND_SPARSE); } +int index_name_pos_sparse(struct index_state *istate, const char *name, int namelen) +{ + return index_name_stage_pos(istate, name, namelen, 0, NO_EXPAND_SPARSE); +} + int index_entry_exists(struct index_state *istate, const char *name, int namelen) { return index_name_stage_pos(istate, name, namelen, 0, NO_EXPAND_SPARSE) >= 0; |