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

Merge branch 'vd/sparse-reset-checkout-fixes'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2022-08-18 13:07:04 -07:00
parent 0d133a3dcf b15207b8cf
commit 80ffc849bd
6 changed files with 141 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cache.h
View File

@ -829,6 +829,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