]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f8f5af2 d7fcbe2)
Merge branch 'ps/object-collision-check'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Jan 2025 00:35:13 +0000 (16:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Jan 2025 00:35:13 +0000 (16:35 -0800)
commit66e01e510a7cca4235489eac128913b069fa58a4
tree09db5dfd3e498edf3fa1c60a3bc345caba072d36tree
parentf8f5af2952e76b4293f1cf0ff09d0e80697f6734commit | diff
parentd7fcbe2c56468ac780c689b02c6a9e056ce39c12commit | diff
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
object-file.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.