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

Author: gitster

.mailmap

@@ -59,6 +59,7 @@ David S. Miller <[email protected]>
 David Turner <[email protected]> <[email protected]>
 David Turner <[email protected]> <[email protected]>
 Derrick Stolee <[email protected]> <[email protected]>
+Derrick Stolee <[email protected]> Derrick Stolee via GitGitGadget <[email protected]>
 Deskin Miller <[email protected]>
 Đoàn Trần Công Danh <[email protected]> Doan Tran Cong Danh
 Dirk Süsserott <[email protected]>

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,