From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Feb 2020 20:42:29 +0000 (-0800)
Subject: Merge branch 'ds/sparse-cone' into maint
X-Git-Tag: v2.25.1~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8dbeba198ee6759874bb68a74131d1d3adfd75ea;p=thirdparty%2Fgit.git

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
---

8dbeba198ee6759874bb68a74131d1d3adfd75ea
diff --cc .mailmap
index 0f20882209,cf3f68ecaf..73fd92e192
--- a/.mailmap
+++ b/.mailmap
@@@ -59,8 -59,8 +59,9 @@@ 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>
  Eric Blake <eblake@redhat.com> <ebb9@byu.net>
  Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net>