mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'ds/sparse-cone'
The code recently added in this release to move to the entry beyond the ones in the same directory in the index in the sparse-cone mode did not count the number of entries to skip over incorrectly, which has been corrected. * ds/sparse-cone: .mailmap: fix GGG authoship screwup unpack-trees: correctly compute result count
This commit is contained in:
commit
043426c8fd
1
.mailmap
1
.mailmap
|
@ -59,6 +59,7 @@ David S. Miller <davem@davemloft.net>
|
|||
David Turner <novalis@novalis.org> <dturner@twopensource.com>
|
||||
David Turner <novalis@novalis.org> <dturner@twosigma.com>
|
||||
Derrick Stolee <dstolee@microsoft.com> <stolee@gmail.com>
|
||||
Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
|
||||
Deskin Miller <deskinm@umich.edu>
|
||||
Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh
|
||||
Dirk Süsserott <newsletter@dirk.my1.cc>
|
||||
|
|
|
@ -1309,14 +1309,14 @@ static int clear_ce_flags_dir(struct index_state *istate,
|
|||
|
||||
if (pl->use_cone_patterns && orig_ret == MATCHED_RECURSIVE) {
|
||||
struct cache_entry **ce = cache;
|
||||
rc = (cache_end - cache) / sizeof(struct cache_entry *);
|
||||
rc = cache_end - cache;
|
||||
|
||||
while (ce < cache_end) {
|
||||
(*ce)->ce_flags &= ~clear_mask;
|
||||
ce++;
|
||||
}
|
||||
} else if (pl->use_cone_patterns && orig_ret == NOT_MATCHED) {
|
||||
rc = (cache_end - cache) / sizeof(struct cache_entry *);
|
||||
rc = cache_end - cache;
|
||||
} else {
|
||||
rc = clear_ce_flags_1(istate, cache, cache_end - cache,
|
||||
prefix,
|
||||
|
|
Loading…
Reference in a new issue