Skip to content

roll back locks in various code paths

Martin Ågren git 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest5 patches 8 repliesIn review
  2. v15 patches 6 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5sequencer: make lockfiles non-staticsequencer.c+5 -50 replies
2/5sequencer: always roll back lock in `do_recursive_merge()`sequencer.c+3 -10 replies
3/5merge-recursive: always roll back lock in `merge_recursive_generic()`merge-recursive.c+4 -10 replies
4/5merge: always roll back lock in `checkout_fast_forward()`merge.c+9 -30 replies
5/5sequencer: do not roll back lockfile unnecessarilysequencer.c+6 -120 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/5] roll back locks in various code paths

This is v2 of my series to always release locks. As before, there's a conflict with pu, where the correct resolution is to take my version of the conflicting hunk.

The only difference to v1 is in patch 3. I'll follow up with a patch to address the confusing pattern which Peff mentioned and which fooled me when I prepared v1.

Martin

Martin Ågren (5):
sequencer: make lockfiles non-static
sequencer: always roll back lock in do_recursive_merge()
merge-recursive: always roll back lock in merge_recursive_generic()
merge: always roll back lock in checkout_fast_forward()
sequencer: do not roll back lockfile unnecessarily

 merge-recursive.c |  5 ++++-
 merge.c           | 12 +++++++++---
 sequencer.c       | 32 ++++++++++++++------------------
 3 files changed, 27 insertions(+), 22 deletions(-)
Signature · 1 line
2.16.2.246.ga4ee44448f