summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-02-14 20:42:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-14 20:42:29 (GMT)
commit8dbeba198ee6759874bb68a74131d1d3adfd75ea (patch)
tree5041cd5ea45698c9ac4eb1d26e1b7a8aab627e78
parente361f36f61b664a36db1d34c3f9e3427ac42656d (diff)
parent7210ca4ee551011b8d7d3ae55c011c4703f07743 (diff)
downloadgit-8dbeba198ee6759874bb68a74131d1d3adfd75ea.zip
git-8dbeba198ee6759874bb68a74131d1d3adfd75ea.tar.gz
git-8dbeba198ee6759874bb68a74131d1d3adfd75ea.tar.bz2
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
-rw-r--r--.mailmap1
-rw-r--r--unpack-trees.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 0f20882..73fd92e 100644
--- a/.mailmap
+++ b/.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>
diff --git a/unpack-trees.c b/unpack-trees.c
index 2f4e2e4..191e738 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,