Sync with Git 2.22.1
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Aug 2019 00:41:39 +0000 (17:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Aug 2019 00:41:39 +0000 (17:41 -0700)
Trivial merge