diff options
| author | Patrick Steinhardt <ps@pks.im> | 2025-01-06 10:24:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-06 16:57:17 +0100 |
| commit | cfae50e40eb72d6116ad56c616b3322474df4a75 (patch) | |
| tree | 80f0bceba0d4ce16055810a7d417b0095a253c7b | |
| parent | object-file: rename variables in `check_collision()` (diff) | |
| download | git-cfae50e40eb72d6116ad56c616b3322474df4a75.tar.xz git-cfae50e40eb72d6116ad56c616b3322474df4a75.zip | |
object-file: don't special-case missing source file in collision check
In 0ad3d65652 (object-file: fix race in object collision check,
2024-12-30) we have started to ignore ENOENT when opening either the
source or destination file of the collision check. This was done to
handle races more gracefully in case either of the potentially-colliding
disappears.
The fix is overly broad though: while the destination file may indeed
vanish racily, this shouldn't ever happen for the source file, which is
a temporary object file (either loose or in packfile format) that we
have just created. So if any concurrent process would have removed that
temporary file it would indicate an actual issue.
Stop treating ENOENT specially for the source file so that we always
bubble up this error.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | object-file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/object-file.c b/object-file.c index e2fa1be303..c1bd746d9e 100644 --- a/object-file.c +++ b/object-file.c @@ -1982,8 +1982,7 @@ static int check_collision(const char *source, const char *dest) fd_source = open(source, O_RDONLY); if (fd_source < 0) { - if (errno != ENOENT) - ret = error_errno(_("unable to open %s"), source); + ret = error_errno(_("unable to open %s"), source); goto out; } |