Merge branch 'jk/config-lockfile-leak-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:07 +0000 (14:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 05:19:08 +0000 (14:19 +0900)
A leakfix.

* jk/config-lockfile-leak-fix:
config: use a static lock_file struct

1  2 
config.c
diff --cc config.c
Simple merge