From: Li Chen Date: Tue, 14 Oct 2025 12:24:31 GMT Subject: [PATCH v4 18/29] tests: t3440: check apply backend error includes option Message-ID: <20251014122452.1851103-19-me@linux.beauty> In-Reply-To: <20251014122452.1851103-1-me@linux.beauty> From: Li Chen Updated the rebase trailer test to assert that the apply-backend error explicitly includes the --trailer option in its message while retaining the existing backend check. Signed-off-by: Li Chen --- t/t3440-rebase-trailer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3440-rebase-trailer.sh b/t/t3440-rebase-trailer.sh index 0c0185d058..6f1a062e8f 100755 --- a/t/t3440-rebase-trailer.sh +++ b/t/t3440-rebase-trailer.sh @@ -34,7 +34,7 @@ test_expect_success 'apply backend is rejected with --trailer' ' test_expect_code 128 \ git rebase --apply --trailer "Reviewed-by: Dev " \ HEAD^ 2>err && - test_grep "requires the merge backend" err && + test_grep "fatal: --trailer requires the merge backend" err && test_cmp_rev HEAD $head_before ' -- 2.51.0