From 1db9d2c3bba2fe95280dca34bc04d261bd5d31f7 Mon Sep 17 00:00:00 2001 From: Paul Betts Date: Thu, 23 Feb 2012 17:11:20 -0800 Subject: [PATCH] Ensure that commits don't fail if committing content that already exists 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). --- src/filebuf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/filebuf.c b/src/filebuf.c index 418efc266..01df8e2d0 100644 --- a/src/filebuf.c +++ b/src/filebuf.c @@ -291,6 +291,8 @@ int git_filebuf_commit(git_filebuf *file, mode_t mode) goto cleanup; } + p_unlink(file->path_original); + error = p_rename(file->path_lock, file->path_original); cleanup: