From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 May 2021 03:36:57 +0000 (+0900)
Subject: Merge branch 'ds/t1092-fix-flake-from-progress'
X-Git-Tag: v2.32.0-rc2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1accb34ce0055b9ab43cdf1a8ef6e22e7ae34ffc;p=thirdparty%2Fgit.git

Merge branch 'ds/t1092-fix-flake-from-progress'

Workaround flaky tests introduced recently.

* ds/t1092-fix-flake-from-progress:
  t1092: revert the "-1" hack for emulating "no progress meter"
  t1092: use GIT_PROGRESS_DELAY for consistent results
---

1accb34ce0055b9ab43cdf1a8ef6e22e7ae34ffc