From: Li Chen <me@linux.beauty>
To: "phillipwood" <phillip.wood@dunelm.org.uk>,
"git" <git@vger.kernel.org>, "Junio C Hamano" <gitster@pobox.com>,
"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>
Subject: [PATCH v5 25/29] t3440: test --trailer without values
Date: Wed, 22 Oct 2025 13:39:45 +0800 [thread overview]
Message-ID: <20251022053951.602605-26-me@linux.beauty> (raw)
In-Reply-To: <20251022053951.602605-1-me@linux.beauty>
Add a regression test to ensure git
rebase --trailer accepts trailers without
values while preserving the separator’s
trailing space in the recorded message.
Signed-off-by: Li Chen <chenl311@chinatelecom.cn>
---
t/t3440-rebase-trailer.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/t/t3440-rebase-trailer.sh b/t/t3440-rebase-trailer.sh
index 4b0b0ee2d3..bed6955001 100755
--- a/t/t3440-rebase-trailer.sh
+++ b/t/t3440-rebase-trailer.sh
@@ -50,6 +50,16 @@ test_expect_success 'reject trailer with missing key before separator' '
test_grep "missing key before separator" err
'
+test_expect_success 'allow trailer with missing value after separator' '
+ git rebase -m --trailer "Acked-by:" HEAD~1 third &&
+ sed -e "s/_/ /g" <<-\EOF >expect &&
+ third
+
+ Acked-by:_
+ EOF
+ test_commit_message HEAD expect
+'
+
test_expect_success 'CLI trailer duplicates allowed; replace policy keeps last' '
git -c trailer.Bug.ifexists=replace -c trailer.Bug.ifmissing=add \
rebase -m --trailer "Bug: 123" --trailer "Bug: 456" HEAD~1 third &&
--
2.51.0
next prev parent reply other threads:[~2025-10-22 5:44 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-22 5:39 [PATCH v5 00/29] rebase: support --trailer Li Chen
2025-10-22 5:39 ` [PATCH v5 01/29] trailer: append trailers in-process and drop the fork to `interpret-trailers` Li Chen
2025-10-23 13:21 ` Phillip Wood
2025-11-04 11:53 ` Li Chen
2025-10-22 5:39 ` [PATCH v5 02/29] trailer: restore interpret_trailers helper Li Chen
2025-10-22 5:39 ` [PATCH v5 03/29] trailer: drop --trailer prefix handling in amend helper Li Chen
2025-10-22 5:39 ` [PATCH v5 04/29] trailer: move config_head and arg_head to if storage Li Chen
2025-10-22 5:39 ` [PATCH v5 05/29] trailer: use bool for had_trailer_before Li Chen
2025-10-22 5:39 ` [PATCH v5 06/29] interpret-trailers: buffer stdout output Li Chen
2025-10-22 5:39 ` [PATCH v5 07/29] trailer: mirror interpret-trailers output flow Li Chen
2025-10-22 5:39 ` [PATCH v5 08/29] trailer: handle trailer append failures gently Li Chen
2025-10-22 5:39 ` [PATCH v5 09/29] rebase: support --trailer Li Chen
2025-10-23 13:21 ` Phillip Wood
2025-10-22 5:39 ` [PATCH v5 10/29] rebase: inline trailer state paths Li Chen
2025-10-22 5:39 ` [PATCH v5 11/29] rebase: reuse buffer for trailer args Li Chen
2025-10-22 5:39 ` [PATCH v5 12/29] rebase: drop redundant strbuf_release call Li Chen
2025-10-22 5:39 ` [PATCH v5 13/29] rebase: skip stripping of --trailer option prefix Li Chen
2025-10-22 5:39 ` [PATCH v5 14/29] rebase: die on invalid trailer args Li Chen
2025-10-22 5:39 ` [PATCH v5 15/29] rebase: validate trailers with configured separators Li Chen
2025-10-22 5:39 ` [PATCH v5 16/29] sequencer: add trailers to message before writing file Li Chen
2025-10-22 5:39 ` [PATCH v5 17/29] t3440: create expect files at point of use Li Chen
2025-10-22 5:39 ` [PATCH v5 18/29] t3440: check apply backend error includes option Li Chen
2025-10-22 5:39 ` [PATCH v5 19/29] t3440: use test_commit_message for trailer checks Li Chen
2025-10-22 5:39 ` [PATCH v5 20/29] t3440: drop redundant resets and pass branch to rebase where needed Li Chen
2025-10-22 5:39 ` [PATCH v5 21/29] t3440: assert trailer on HEAD after conflict rebase Li Chen
2025-10-22 5:39 ` [PATCH v5 22/29] rebase: persist --trailer options across restarts Li Chen
2025-10-22 5:39 ` [PATCH v5 23/29] t3440: remove redundant --keep-empty Li Chen
2025-10-22 5:39 ` [PATCH v5 24/29] t3440: use helper for trailer checks Li Chen
2025-10-22 5:39 ` Li Chen [this message]
2025-10-22 5:39 ` [PATCH v5 26/29] t3440: convert ex.com to example.com Li Chen
2025-10-22 5:39 ` [PATCH v5 27/29] t3440: ensure trailers persist after rebase continue Li Chen
2025-10-22 5:39 ` [PATCH v5 28/29] t3440: exercise trailer config mapping Li Chen
2025-10-22 5:39 ` [PATCH v5 29/29] sequencer: honor --trailer with fixup -C Li Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251022053951.602605-26-me@linux.beauty \
--to=me@linux.beauty \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox