diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-08 09:14:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-08 09:14:42 -0800 |
| commit | 3fe6612d4cb85d9e92ad339ac6ef975780715c40 (patch) | |
| tree | c93e9ff09af4f0521cdc303958b679bf9c78d5c3 /t/test-lib-functions.sh | |
| parent | c6dea59323c70ae29adaac6a6ec75cf653ad753c (diff) | |
| parent | dea63088928cde2fd264a852a9b14c05178e0838 (diff) | |
| download | git-3fe6612d4cb85d9e92ad339ac6ef975780715c40.tar.gz | |
Merge branch 'ds/scalar-ignore-cron-error'
Allow "scalar" to warn but continue when its periodic maintenance
feature cannot be enabled.
* ds/scalar-ignore-cron-error:
scalar: only warn when background maintenance fails
t921*: test scalar behavior starting maintenance
t: allow 'scalar' in test_must_fail
Diffstat (limited to 't/test-lib-functions.sh')
| -rw-r--r-- | t/test-lib-functions.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 7992222703..75b8ee95e7 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1016,7 +1016,7 @@ test_must_fail_acceptable () { fi case "$1" in - git|__git*|test-tool|test_terminal) + git|__git*|scalar|test-tool|test_terminal) return 0 ;; *) |