proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-21 22:21:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure that commits don't fail if committing content that already exists

Browse Source 
Making a commit that results in a blob that already exists in the ODB (i.e.
committing something, then making a revert commit) will result in us trying
to p_rename -> MoveFileExW a temp file into the existing ODB entry. Despite
the MOVEFILE_REPLACE_EXISTING flag is passed in, Win32 does not care and
fails it with STATUS_ACCESS_DENIED.

To fix this, we p_unlink the ODB entry before attempting to rename it. This
call will typically fail, but we don't care, we'll let the p_rename fail if
the file actually does exist and we couldn't delete it for some reason (ACLs,
etc).
This commit is contained in:
Paul Betts 2012-02-23 17:11:20 -08:00
parent 34ab819ef9
commit 1db9d2c3bb
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/filebuf.c
View File

@ -291,6 +291,8 @@ int git_filebuf_commit(git_filebuf *file, mode_t mode)
goto cleanup; goto cleanup;
} }
p_unlink(file->path_original);
error = p_rename(file->path_lock, file->path_original); error = p_rename(file->path_lock, file->path_original);
cleanup: cleanup: