зеркало из https://github.com/microsoft/git.git
hold_lock_file_for_append(): release lock on errors
If there is an error copying the old contents to the lockfile, roll back the lockfile before exiting so that the lockfile is not held until process cleanup. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
41dd4ffaf9
Коммит
ebb8e380e9
|
@ -219,13 +219,13 @@ int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags)
|
|||
if (errno != ENOENT) {
|
||||
if (flags & LOCK_DIE_ON_ERROR)
|
||||
die("cannot open '%s' for copying", path);
|
||||
close(fd);
|
||||
rollback_lock_file(lk);
|
||||
return error("cannot open '%s' for copying", path);
|
||||
}
|
||||
} else if (copy_fd(orig_fd, fd)) {
|
||||
if (flags & LOCK_DIE_ON_ERROR)
|
||||
exit(128);
|
||||
close(fd);
|
||||
rollback_lock_file(lk);
|
||||
return -1;
|
||||
}
|
||||
return fd;
|
||||
|
|
Загрузка…
Ссылка в новой задаче