Merge branch 'nd/config-misc-fixes' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 23:00:31 +0000 (15:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 23:00:31 +0000 (15:00 -0800)
commit6be64a8671f887b22956c440910a01ac2d40ce82
treef6a24c4df55d94b6a201b192683ce6f883e83cfa
parent631e4200e24e33c510350f5984676395e28417ec
parentc06fa62dfc9c882f60250e60ad91fbb6a7e6f8e7
Merge branch 'nd/config-misc-fixes' into next

Leakage of lockfiles in the config subsystem has been fixed.

* nd/config-misc-fixes:
  config.c: handle lock file in error case in git_config_rename_...
  config.c: rename label unlock_and_out
  config.c: handle error case for fstat() calls
config.c