From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 2 May 2016 12:24:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master'
X-Git-Tag: 1.4.2~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/misc/commitdiff_plain/e3c481ba08bda2536aa76f9e3a6be2146e2b135d

Merge remote-tracking branch 'refs/remotes/origin/master'

* refs/remotes/origin/master:
  locking.c, locking.1: Make the protocol safe if the lockfile is (re)moved.
  locking.c: Refactor the main locking flow.
  locking.c: Use shell convention to report child killed by a signal.
  locking.c: Rename exit status variable to `rc'.
  locking.c: Compress vertically.  Remove pointless `$Id' comment.
---

e3c481ba08bda2536aa76f9e3a6be2146e2b135d