mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-30 04:26:10 +02:00
Code

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

Workaround flaky tests introduced recently.

* ds/t1092-fix-flake-from-progress:
  t1092: revert the "-1" hack for emulating "no progress meter"
This commit is contained in:
Junio C Hamano 2021-05-26 06:26:02 +09:00
parent 3a1982b559 a96355d84c
commit 5c116071b1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t1092-sparse-checkout-compatibility.sh
View File

@ -106,18 +106,18 @@ init_repos () {
run_on_sparse () {
(
cd sparse-checkout &&
GIT_PROGRESS_DELAY=-1 "$@" >../sparse-checkout-out 2>../sparse-checkout-err
GIT_PROGRESS_DELAY=100000 "$@" >../sparse-checkout-out 2>../sparse-checkout-err
) &&
(
cd sparse-index &&
GIT_PROGRESS_DELAY=-1 "$@" >../sparse-index-out 2>../sparse-index-err
GIT_PROGRESS_DELAY=100000 "$@" >../sparse-index-out 2>../sparse-index-err
)
}
run_on_all () {
(
cd full-checkout &&
GIT_PROGRESS_DELAY=-1 "$@" >../full-checkout-out 2>../full-checkout-err
GIT_PROGRESS_DELAY=100000 "$@" >../full-checkout-out 2>../full-checkout-err
) &&
run_on_sparse "$@"
}