Merge branch 'jk/config-lockfile-leak-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:28:05 +0000 (17:28 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:28:05 +0000 (17:28 +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