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

Correct an API anomaly.

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