refs.c:update_refs() intermingles doing updates and checks with actually applying changes to the refs in loops that abort on error. This is done one ref at a time and means that if an error is detected that will fail the operation after only some of the ref operations have been been updated on the disk. These patches change the update and delete functions to use a three call pattern of 1, lock 2, update, or flag for deletion 3, apply on disk In the final patch I change update_refs to perform these actions in three separate loops where the final loop to 'apply on disk' all the changes will only be performed if there were no error conditions detected during any of previous loops. This should make the changes of refs in update_refs slightly more atomic. This may overlap with other current patch series for making refs updates more atomic which may mean these patches become obsolete, but I would still like some review and feedback on these changes. Version 2: Updates and fixes based on Junio's feedback. * Fix the subject line for patches so they comply with the project standard. * Redo the update/delete loops so that we maintain the correct order of operations. Perform all updates first, then perform the deletes. * Add an additional patch that allows us to do the update/delete in the correct order from within a single loop by first sorting the refs so that deletes are after all non-deletes. Ronnie Sahlberg (4): refs.c: split writing and commiting a ref into two separate functions refs.c: split delete_ref_loose() into a separate flag-for-deletion and commit phase refs.c: change update_refs to run the commit loops once all work is finished refs.c: sort the refs by new_sha1 and merge the two update/delete loops into one branch.c | 10 ++++- builtin/commit.c | 5 +++ builtin/fetch.c | 7 +++- builtin/receive-pack.c | 4 ++ builtin/replace.c | 6 ++- builtin/tag.c | 6 ++- fast-import.c | 7 +++- refs.c | 102 +++++++++++++++++++++++++++++++++---------------- refs.h | 6 +++ sequencer.c | 4 ++ walker.c | 4 ++ 11 files changed, 123 insertions(+), 38 deletions(-) -- 1.9.1.478.ga5a8238.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html