Merge branch 'en/ort-perf-batch-13' into seen
authorJunio C Hamano <gitster@pobox.com>
Sat, 19 Jun 2021 07:30:25 +0000 (16:30 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 19 Jun 2021 07:30:25 +0000 (16:30 +0900)
commit488ea585b8d004748347f4bd8a44307fb60db6c0
treedb3f77c5d7807eb8325a6a4e8b4faaae6aed45a2
parent1f47af54a5d2be00c8786f8d49f7f909a46e3977
parentde2d00383f3909eea77b5be05bb88fe6984dc3f3
Merge branch 'en/ort-perf-batch-13' into seen

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
diffcore-rename.c
merge-ort.c
promisor-remote.c