From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Feb 2023 17:14:42 +0000 (-0800)
Subject: Merge branch 'ds/scalar-ignore-cron-error'
X-Git-Tag: v2.40.0-rc0~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fe6612d4cb85d9e92ad339ac6ef975780715c40;p=thirdparty%2Fgit.git

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
---

3fe6612d4cb85d9e92ad339ac6ef975780715c40