Merge branch 'jk/repo-init-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2019 19:26:35 +0000 (12:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2019 19:26:35 +0000 (12:26 -0700)
Further clean-up of the initialization code.

* jk/repo-init-cleanup:
config: stop checking whether the_repository is NULL
common-main: delay trace2 initialization
t1309: use short branch name in includeIf.onbranch test

Trivial merge