Martin Ågren <martin.ag...@gmail.com> writes: > Patches 2-4 are the actual fixes where I teach some functions to always > roll back the lock they're holding. Notably, these are all in "libgit". > > Patch 1 is a "while at it" to use locks on the stack instead of having > them be static. Patch 5 removes code to roll back locks which are > already rolled back. > > I've based this on maint. There's a conflict on pu, with c7d4394111 > (sequencer: avoid using errno clobbered by rollback_lock_file(), > 2018-02-11). The conflict resolution would be to take my version for the > "could not lock HEAD"-hunk.
Thanks for running a trial merge before sending your patches out. I wish there were more contributors like you ;-) The changes looked reasonable.
