]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ds/sparse-cone' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:42:29 +0000 (12:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:42:29 +0000 (12:42 -0800)
commit8dbeba198ee6759874bb68a74131d1d3adfd75ea
tree5041cd5ea45698c9ac4eb1d26e1b7a8aab627e78
parente361f36f61b664a36db1d34c3f9e3427ac42656d
parent7210ca4ee551011b8d7d3ae55c011c4703f07743
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
.mailmap
unpack-trees.c