diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-01-16 16:35:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-16 16:35:13 -0800 |
| commit | 66e01e510a7cca4235489eac128913b069fa58a4 (patch) | |
| tree | 09db5dfd3e498edf3fa1c60a3bc345caba072d36 /commit.c | |
| parent | f8f5af2952e76b4293f1cf0ff09d0e80697f6734 (diff) | |
| parent | d7fcbe2c56468ac780c689b02c6a9e056ce39c12 (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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions