From: Li Chen <me@linux.beauty>
To: "phillipwood" <phillip.wood@dunelm.org.uk>,
"git" <git@vger.kernel.org>, "Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v3 0/2] rebase: support --trailer
Date: Sun, 3 Aug 2025 23:00:55 +0800 [thread overview]
Message-ID: <20250803150059.402017-1-me@linux.beauty> (raw)
From: Li Chen <chenl311@chinatelecom.cn>
This two-patch series teaches git rebase a new
--trailer <text> option and, as a prerequisite, moves all trailer
handling out of the external interpret-trailers helper and into the
builtin code path, as suggested by Phillip Wood.
Patch 1 switches trailer.c to an in-memory implementation
(amend_strbuf_with_trailers()). It removes every fork/exec.
Patch 2 builds on that helper to implement
git rebase --trailer. When the option is given we:
force the merge backend (apply/am backend lacks a message filter),
automatically enable --force-rebase so that fast-forwarded
commits are rewritten, and append the requested trailer(s) to every
rewritten commit.
State is stored in $state_dir/trailer so an interrupted rebase can
resume safely. A dedicated test-suite (t3440) exercises plain,
conflict, --root, invalid-input scenarios and etc.
All t/*.sh testcases have run successfully.
Github CI tests have all been past: https://github.com/FirstLoveLife/git/actions/runs/16704004515
v3: merges the remaining trailer paths into one in-process helper, dropping the
duplicate code, as pointed by Junio and Phillip [1]
v2: fix issues pointed by Phillip
RFC link: https://lore.kernel.org/git/196a5ac1393.f5b4db7d187309.2451613571977217927@linux.beauty/
Comments welcome!
[1]: https://lore.kernel.org/git/xmqq8qlzkukw.fsf@gitster.g/
Li Chen (2):
trailer: append trailers in-process and drop the fork to
`interpret-trailers`
rebase: support --trailer
Documentation/git-rebase.adoc | 7 ++
builtin/interpret-trailers.c | 117 ++++++++-----------------------
builtin/rebase.c | 98 ++++++++++++++++++++++++++
sequencer.c | 13 ++++
sequencer.h | 3 +
t/meson.build | 1 +
t/t3440-rebase-trailer.sh | 95 ++++++++++++++++++++++++++
trailer.c | 125 +++++++++++++++++++++++++++++++---
trailer.h | 18 ++++-
9 files changed, 375 insertions(+), 102 deletions(-)
create mode 100755 t/t3440-rebase-trailer.sh
--
2.50.0
next reply other threads:[~2025-08-03 15:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-03 15:00 Li Chen [this message]
2025-08-03 15:00 ` [PATCH v3 1/2] trailer: append trailers in-process and drop the fork to `interpret-trailers` Li Chen
2025-08-05 13:17 ` Phillip Wood
2025-08-07 2:45 ` Li Chen
2025-10-21 10:01 ` Li Chen
2025-08-03 15:00 ` [PATCH v3 2/2] rebase: support --trailer Li Chen
2025-08-05 15:38 ` Phillip Wood
2025-08-06 10:28 ` Phillip Wood
2025-08-06 13:19 ` Phillip Wood
2025-08-07 2:40 ` Li Chen
2025-08-28 23:35 ` Junio C Hamano
2025-09-18 8:36 ` Li Chen
2025-08-07 2:40 ` Li Chen
2025-08-03 16:35 ` [PATCH v3 0/2] " Junio C Hamano
2025-08-04 1:44 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250803150059.402017-1-me@linux.beauty \
--to=me@linux.beauty \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).