From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 19:40:42 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.23.0-rc0~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8b79343fc06ec8258499cbaca40fe1b04c209cd1?ds=inline;hp=--cc

Sync with maint

* maint:
Merge fixes made on the 'master' front
---

8b79343fc06ec8258499cbaca40fe1b04c209cd1