roll back locks in various code paths
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest5 patches 8 repliesIn review
- v15 patches 6 repliesSuperseded
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/5 | sequencer: make lockfiles non-staticsequencer.c | +5 | 0 replies | |
| 2/5 | sequencer: always roll back lock in `do_recursive_merge()`sequencer.c | +3 | 0 replies | |
| 3/5 | merge-recursive: always roll back lock in `merge_recursive_generic()`merge-recursive.c | +4 | 0 replies | |
| 4/5 | merge: always roll back lock in `checkout_fast_forward()`merge.c | +9 | 0 replies | |
| 5/5 | sequencer: do not roll back lockfile unnecessarilysequencer.c | +6 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
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