Merge branch 'jk/lock-ref-sha1-basic-return-errors'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:26:27 +0000 (12:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:26:27 +0000 (12:26 -0800)
Correct an API anomaly.

* jk/lock-ref-sha1-basic-return-errors:
lock_ref_sha1_basic: do not die on locking errors

Trivial merge