]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 89efac8 2bff554)
Merge branch 'en/ort-perf-batch-13'
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Jul 2021 00:42:45 +0000 (17:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Jul 2021 00:42:45 +0000 (17:42 -0700)
commitfdbcdfcf61a64a1c2d2dd58c1a9111b45b6c1536
tree4cd0716eb64769a46256a78c6f2adc33c479be30tree | snapshot
parent89efac81c716bb296098fd1c5482bac3ecb344c5commit | diff
parent2bff554b23e8d5c17f4e6827358bb51811fc7137commit | diff
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
diffcore-rename.c diff1 | diff2 | blob | history
merge-ort.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.