On Tue, Apr 29, 2014 at 2:41 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Ronnie Sahlberg <sahlberg@xxxxxxxxxx> writes: > >> This patch series is based on mhagger/ref-transactions and expands on the >> transaction API. It converts all external (outside of refs.c) callers to >> use the transaction API for any writes. >> This makes most of the ref updates to become atomic when there are failures >> locking or writing to a ref. > > I think I saw some more comments to be addressed on this round, but > I'll try to push it through into 'pu' by attempting to resolve > conflicts so that I can ask you to eyeball the result. This series > seem to conflict with your own rs/ref-update-check-errors-early > topic that is already in 'next'. > > If I screwed up the conflict resolution (which is very possible), I > may have to ask you to rebase this series on top of acc62aa (which > is the merge of rs/ref-update-check-errors-early to 'next'), but I > am hoping that conflict resolution I'll push out today will be > correct. We'll see. > Thanks. I just sent v5 of the patch series where I have addressed the comments from Eric and Michael so far. Otherwise, how hard would it be to drop rs/ref-update-check-errors-early ? I can just redo those patches later, and that might be the easiest solution. Regards ronnie sahlberg > Thanks. -- 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