On Mon, Dec 19, 2016 at 10:14:27AM -0800, Junio C Hamano wrote: > Shouldn't the error-return path in the second hunk rollback the > lockfile to clean after itself? The existing "Oh, we cannot chmod > to match the original" check that comes immediately after shares the > same issue, so this is not a new problem, but making an existing one > worse. OK. How about two more patches on top (or bottom, does not matter)? The second one should fix this. The first is sort of "good to do". [PATCH 1/2] config.c: rename label unlock_and_out [PATCH 2/2] config.c: handle lock file in error case in git_config_rename_... -- Duy