diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-08-18 23:07:04 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-08-18 23:07:04 +0300 |
commit | 80ffc849bdd5ed111a2ec070856ef67e075572c6 (patch) | |
tree | e40b7bd0e84ae6ea1fdd5066ef6c42cf98e3ecfc /cache.h | |
parent | 0d133a3dcf43eb0396a5899008a4ff4ceaeb0d6e (diff) | |
parent | b15207b8cf1a1930fe5eb076c08c6ddc92d9282d (diff) |
Merge branch 'vd/sparse-reset-checkout-fixes'
Fixes to sparse index compatibility work for "reset" and "checkout"
commands.
* 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 'cache.h')
-rw-r--r-- | cache.h | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -830,6 +830,15 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na int index_name_pos(struct index_state *, const char *name, int namelen); /* + * Like index_name_pos, returns the position of an entry of the given name in + * the index if one exists, otherwise returns a negative value where the negated + * value minus 1 is the position where the index entry would be inserted. Unlike + * index_name_pos, however, a sparse index is not expanded to find an entry + * inside a sparse directory. + */ +int index_name_pos_sparse(struct index_state *, const char *name, int namelen); + +/* * Determines whether an entry with the given name exists within the * given index. The return value is 1 if an exact match is found, otherwise * it is 0. Note that, unlike index_name_pos, this function does not expand |