summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-30 22:17:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-30 22:17:08 (GMT)
commit043426c8fd58bfa1b897828309363a864d547458 (patch)
tree5e32da2accab3603c556e66d274cb04726c7f28e /unpack-trees.c
parent34246a1a3ca7eb50229e93b0dda799f0abe92cc4 (diff)
parent7210ca4ee551011b8d7d3ae55c011c4703f07743 (diff)
downloadgit-043426c8fd58bfa1b897828309363a864d547458.zip
git-043426c8fd58bfa1b897828309363a864d547458.tar.gz
git-043426c8fd58bfa1b897828309363a864d547458.tar.bz2
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
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index d5f4d99..e4b7c6c 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -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,