mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

object-file: don't special-case missing source file in collision check

Browse Source 
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>
This commit is contained in:
Patrick Steinhardt
2025-01-06 10:24:26 +01:00
committed by Junio C Hamano
parent c1acf1a317
commit cfae50e40e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
object-file.c
View File

@ -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;
}