[PATCH v5 18/29] t3440: check apply backend error includes option

Li Chen
2025-10-22T05:43:21Z

From: Li Chen <chenl311@chinatelecom.cn>

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 <chenl311@chinatelecom.cn>
---
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 a8108f2296..6b1c93b4cb 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 <dev@example.com>" \
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