Skip to content

Commit c712ec9

Browse files
pks-tdscho
authored andcommitted
object-file: don't special-case missing source file in collision check
In 0ad3d65 (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>
1 parent db47f3b commit c712ec9

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Diff for: object-file.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -1978,8 +1978,7 @@ static int check_collision(const char *source, const char *dest)
19781978

19791979
fd_source = open(source, O_RDONLY);
19801980
if (fd_source < 0) {
1981-
if (errno != ENOENT)
1982-
ret = error_errno(_("unable to open %s"), source);
1981+
ret = error_errno(_("unable to open %s"), source);
19831982
goto out;
19841983
}
19851984

0 commit comments

Comments
 (0)