git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v5 13/29] rebase: skip stripping of --trailer option prefix

From
Li Chen <me@linux.beauty>
Date
Oct 22, 2025, 05:39 UTC
Message-ID
<20251022053951.602605-14-me@linux.beauty>
In-Reply-To
<20251022053951.602605-1-me@linux.beauty>

Removed redundant --trailer= prefix stripping in validate_trailer_args_after_config() since OPT_STRVEC already stores only the argument text.

Signed-off-by: Li Chen <chenl311@chinatelecom.cn>
---
 builtin/rebase.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index a950005dfc..3ac1eda61b 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1128,13 +1128,9 @@ static int validate_trailer_args_after_config(const struct strvec *cli_args,
 					      struct strbuf *err)
 {
 	for (size_t i = 0; i < cli_args->nr; i++) {
-		const char *raw = cli_args->v[i];
-		const char *txt; // Key[:=]Val
+		const char *txt = cli_args->v[i]; // Key[:=]Val
 		const char *sep;
 
-		if (!skip_prefix(raw, "--trailer=", &txt))
-			txt = raw;
-
 		if (!*txt) {
 			strbuf_addstr(err, _("empty --trailer argument"));
 			return -1;
-- 
2.51.0
Previous: Li ChenNext: Li Chen
Message 17 of 33 in “rebase: support --trailer”
  1. 00/29 rebase: support --trailerLi Chen, Oct 22, 2025
  2. 01/29 trailer: append trailers in-process and drop the fork to `interpret-trailers`Li Chen, Oct 22, 2025
  3. Phillip WoodOct 23, 2025
  4. Li ChenNov 4, 2025
  5. 02/29 trailer: restore interpret_trailers helperLi Chen, Oct 22, 2025
  6. 03/29 trailer: drop --trailer prefix handling in amend helperLi Chen, Oct 22, 2025
  7. 04/29 trailer: move config_head and arg_head to if storageLi Chen, Oct 22, 2025
  8. 05/29 trailer: use bool for had_trailer_beforeLi Chen, Oct 22, 2025
  9. 06/29 interpret-trailers: buffer stdout outputLi Chen, Oct 22, 2025
  10. 07/29 trailer: mirror interpret-trailers output flowLi Chen, Oct 22, 2025
  11. 08/29 trailer: handle trailer append failures gentlyLi Chen, Oct 22, 2025
  12. 09/29 rebase: support --trailerLi Chen, Oct 22, 2025
  13. Phillip WoodOct 23, 2025
  14. 10/29 rebase: inline trailer state pathsLi Chen, Oct 22, 2025
  15. 11/29 rebase: reuse buffer for trailer argsLi Chen, Oct 22, 2025
  16. 12/29 rebase: drop redundant strbuf_release callLi Chen, Oct 22, 2025
  17. 13/29 rebase: skip stripping of --trailer option prefixLi Chen, Oct 22, 2025
  18. 14/29 rebase: die on invalid trailer argsLi Chen, Oct 22, 2025
  19. 15/29 rebase: validate trailers with configured separatorsLi Chen, Oct 22, 2025
  20. 16/29 sequencer: add trailers to message before writing fileLi Chen, Oct 22, 2025
  21. 17/29 t3440: create expect files at point of useLi Chen, Oct 22, 2025
  22. 18/29 t3440: check apply backend error includes optionLi Chen, Oct 22, 2025
  23. 19/29 t3440: use test_commit_message for trailer checksLi Chen, Oct 22, 2025
  24. 20/29 t3440: drop redundant resets and pass branch to rebase where neededLi Chen, Oct 22, 2025
  25. 21/29 t3440: assert trailer on HEAD after conflict rebaseLi Chen, Oct 22, 2025
  26. 22/29 rebase: persist --trailer options across restartsLi Chen, Oct 22, 2025
  27. 23/29 t3440: remove redundant --keep-emptyLi Chen, Oct 22, 2025
  28. 24/29 t3440: use helper for trailer checksLi Chen, Oct 22, 2025
  29. 25/29 t3440: test --trailer without valuesLi Chen, Oct 22, 2025
  30. 26/29 t3440: convert ex.com to example.comLi Chen, Oct 22, 2025
  31. 27/29 t3440: ensure trailers persist after rebase continueLi Chen, Oct 22, 2025
  32. 28/29 t3440: exercise trailer config mappingLi Chen, Oct 22, 2025
  33. 29/29 sequencer: honor --trailer with fixup -CLi Chen, Oct 22, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.