On 6 October 2017 at 21:44, Martin Ågren <martin.agren@xxxxxxxxx> wrote: > Ok, thanks. I've got a rerolled series running through the final checks > right now. I did end up making this log message a bit more succinct. This is v3 of this series. All patches are identical to ma/lockfile-fixes in Junio's tree, except 10 and 11. Martin Ågren (12): sha1_file: do not leak `lock_file` treewide: prefer lockfiles on the stack lockfile: fix documentation on `close_lock_file_gently()` tempfile: fix documentation on `delete_tempfile()` checkout-index: simplify locking logic cache-tree: simplify locking logic apply: move lockfile into `apply_state` apply: remove `newfd` from `struct apply_state` cache.h: document `write_locked_index()` read-cache: drop explicit `CLOSE_LOCK`-flag read-cache: leave lock in right state in `write_locked_index()` read_cache: roll back lock in `update_index_if_able()` apply.c | 25 ++++++++----------------- apply.h | 8 +++----- builtin/am.c | 27 ++++++++++++--------------- builtin/apply.c | 4 +--- builtin/checkout-index.c | 8 +++----- builtin/checkout.c | 14 ++++++-------- builtin/clone.c | 7 +++---- builtin/commit.c | 10 +++++----- builtin/diff.c | 7 +++---- builtin/difftool.c | 1 - cache-tree.c | 12 ++++-------- cache.h | 25 ++++++++++++++++++++++++- config.c | 17 ++++++++--------- lockfile.h | 4 ++-- merge-recursive.c | 6 +++--- merge.c | 8 +++----- read-cache.c | 31 +++++++++++++++++-------------- sequencer.c | 1 - sha1_file.c | 19 ++++++++----------- tempfile.h | 8 ++++---- wt-status.c | 8 ++++---- 21 files changed, 121 insertions(+), 129 deletions(-) -- 2.15.0.rc0
