diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:42:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:42:29 -0800 |
| commit | 8dbeba198ee6759874bb68a74131d1d3adfd75ea (patch) | |
| tree | 5041cd5ea45698c9ac4eb1d26e1b7a8aab627e78 /unpack-trees.c | |
| parent | e361f36f61b664a36db1d34c3f9e3427ac42656d (diff) | |
| parent | 7210ca4ee551011b8d7d3ae55c011c4703f07743 (diff) | |
| download | git-8dbeba198ee6759874bb68a74131d1d3adfd75ea.tar.xz | |
Merge branch 'ds/sparse-cone' into maint
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
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 2f4e2e494a..191e738143 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1307,14 +1307,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, |