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 v2 0/2] rebase: support --trailer
Date: Tue, 10 Jun 2025 20:34:57 +0800 [thread overview]
Message-ID: <20250610123459.278582-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/15558597606/job/43805117563
(except for debian built test because of network issue)
RFC link: https://lore.kernel.org/git/196a5ac1393.f5b4db7d187309.2451613571977217927@linux.beauty/
The review comments from Phillip in the RFC series have been fixed.
Thanks a lot for Phillip's great review!
Comments welcome!
Li Chen (2):
trailer: append trailers in-process and drop the fork to
`interpret-trailers`
rebase: support --trailer
Documentation/git-rebase.adoc | 7 ++
builtin/rebase.c | 98 +++++++++++++++++++++++
sequencer.c | 13 +++
sequencer.h | 3 +
t/meson.build | 1 +
t/t3440-rebase-trailer.sh | 95 ++++++++++++++++++++++
trailer.c | 147 +++++++++++++++++++++++++++++++---
trailer.h | 17 ++++
8 files changed, 372 insertions(+), 9 deletions(-)
create mode 100755 t/t3440-rebase-trailer.sh
--
2.49.0
next reply other threads:[~2025-06-10 12:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-10 12:34 Li Chen [this message]
2025-06-10 12:34 ` [PATCH v2 1/2] trailer: append trailers in-process and drop the fork to `interpret-trailers` Li Chen
2025-06-11 0:09 ` Junio C Hamano
2025-06-11 9:15 ` phillip.wood123
2025-06-11 15:34 ` Junio C Hamano
2025-06-12 5:40 ` Li Chen
2025-06-10 12:34 ` [PATCH v2 2/2] rebase: support --trailer 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=20250610123459.278582-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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox