Skip to content

Commit 3a1982b

Browse files
committed
Merge branch 'ds/t1092-fix-flake-from-progress' into next
Workaround flaky tests introduced recently. * ds/t1092-fix-flake-from-progress: t1092: use GIT_PROGRESS_DELAY for consistent results
2 parents 023521f + e2b0574 commit 3a1982b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

t/t1092-sparse-checkout-compatibility.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,18 +106,18 @@ init_repos () {
106106
run_on_sparse () {
107107
(
108108
cd sparse-checkout &&
109-
"$@" >../sparse-checkout-out 2>../sparse-checkout-err
109+
GIT_PROGRESS_DELAY=-1 "$@" >../sparse-checkout-out 2>../sparse-checkout-err
110110
) &&
111111
(
112112
cd sparse-index &&
113-
"$@" >../sparse-index-out 2>../sparse-index-err
113+
GIT_PROGRESS_DELAY=-1 "$@" >../sparse-index-out 2>../sparse-index-err
114114
)
115115
}
116116

117117
run_on_all () {
118118
(
119119
cd full-checkout &&
120-
"$@" >../full-checkout-out 2>../full-checkout-err
120+
GIT_PROGRESS_DELAY=-1 "$@" >../full-checkout-out 2>../full-checkout-err
121121
) &&
122122
run_on_sparse "$@"
123123
}

0 commit comments

Comments
 (0)