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

anaisbetts · anaisbetts · commit 1db9d2c3bba2 · 2012-02-23T17:11:20.000-08:00
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 -&gt; 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).
diff --git 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:

Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,8 @@ int git_filebuf_commit(git_filebuf *file, mode_t mode)`
`291`	`291`	`goto cleanup;`
`292`	`292`	`}`
`293`	`293`
	`294`	`+ p_unlink(file->path_original);`
	`295`	`+`
`294`	`296`	`error = p_rename(file->path_lock, file->path_original);`
`295`	`297`
`296`	`298`	`cleanup:`