Thread (43 messages) 43 messages, 3 authors, 2025-11-03
STALE241d
Revisions (2)
  1. v4 current
  2. v5 [diff vs current]

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

From: Li Chen <hidden>
Date: 2025-10-14 12:27:57
Subsystem: the rest · Maintainer: Linus Torvalds

From: Li Chen <redacted>

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 <redacted>
---
 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 <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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help