From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Jan 2025 00:35:13 +0000 (-0800)
Subject: Merge branch 'ps/object-collision-check'
X-Git-Tag: v2.49.0-rc0~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66e01e510a7cca4235489eac128913b069fa58a4;p=thirdparty%2Fgit.git

Merge branch 'ps/object-collision-check'

CI jobs gave sporadic failures, which turns out that that the
object finalization code was giving an error when it did not have
to.

* ps/object-collision-check:
  object-file: retry linking file into place when occluding file vanishes
  object-file: don't special-case missing source file in collision check
  object-file: rename variables in `check_collision()`
  object-file: fix race in object collision check
---

66e01e510a7cca4235489eac128913b069fa58a4