From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Jul 2021 00:42:45 +0000 (-0700)
Subject: Merge branch 'en/ort-perf-batch-13'
X-Git-Tag: v2.33.0-rc0~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fdbcdfcf61a64a1c2d2dd58c1a9111b45b6c1536;p=thirdparty%2Fgit.git

Merge branch 'en/ort-perf-batch-13'

Performance tweaks of "git merge -sort" around lazy fetching of objects.

* en/ort-perf-batch-13:
  merge-ort: add prefetching for content merges
  diffcore-rename: use a different prefetch for basename comparisons
  diffcore-rename: allow different missing_object_cb functions
  t6421: add tests checking for excessive object downloads during merge
  promisor-remote: output trace2 statistics for number of objects fetched
---

fdbcdfcf61a64a1c2d2dd58c1a9111b45b6c1536