From: Phillip Wood <phillip.wood123@gmail•com>
To: Li Chen <me@linux•beauty>,
phillipwood <phillip.wood@dunelm•org.uk>,
git <git@vger•kernel.org>, Junio C Hamano <gitster@pobox•com>,
Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail•com>
Subject: Re: [PATCH v6 0/4] rebase: support --trailer
Date: Wed, 12 Nov 2025 14:50:27 +0000 [thread overview]
Message-ID: <bfa6c82d-f0b9-4248-88be-8a95bc22ebc1@gmail.com> (raw)
In-Reply-To: <20251105142944.73061-1-me@linux.beauty>
Hi Li
On 05/11/2025 14:29, Li Chen wrote:
> From: Li Chen <chenl311@chinatelecom•cn>
>
> This series routes all trailer insertion through an in-process path, removing
> the fork/exec to builtin/interpret-trailers and tempfile juggling. The first
> three commits centralize logic to reduce overhead and simplify error handling.
> The final commit adds git rebase --trailer, currently supported with the merge
> backend only (rejecting apply-only scenarios and validating input early).
I've left quite a few comments but overall this is looking much better
now, it needs a bit of cleaning up but I didn't spot any major issues.
Thanks for working on it
Phillip
> all t/*.sh testcases have run successfully.
>
> v6: squash all fix commits and split refactor step from the original patch based on Phillip's suggestion and codes [4].
> v5: fix all Kristoffer's review comments form v4[3] in place and without new patches.
> v4: fix all reviewer comments in v3. [2], and add patch 1~8 & 10~29 to fix review comments.
> 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 very very welcome!
>
> [1]: https://lore.kernel.org/git/xmqq8qlzkukw.fsf@gitster.g/
> [2]: https://lore.kernel.org/git/20250803150059.402017-1-me@linux.beauty/
> [3]: https://lore.kernel.org/git/20251014122452.1851103-1-me@linux.beauty/
> [4]: https://lore.kernel.org/git/7d12b046-365f-441c-af8e-8a39d61efbbd@gmail.com/
>
> Li Chen (4):
> interpret-trailers: factor out buffer-based processing to
> process_trailers()
> trailer: move process_trailers to trailer.h
> trailer: append trailers in-process and drop the fork to
> `interpret-trailers`
> rebase: support --trailer
>
> Documentation/git-rebase.adoc | 9 ++-
> builtin/commit.c | 2 +-
> builtin/interpret-trailers.c | 81 ++------------------
> builtin/rebase.c | 50 +++++++++++++
> builtin/tag.c | 3 +-
> sequencer.c | 34 +++++++++
> sequencer.h | 4 +-
> t/meson.build | 1 +
> t/t3440-rebase-trailer.sh | 134 ++++++++++++++++++++++++++++++++++
> trailer.c | 129 +++++++++++++++++++++++++++++---
> trailer.h | 13 +++-
> wrapper.c | 16 ++++
> wrapper.h | 6 ++
> 13 files changed, 392 insertions(+), 90 deletions(-)
> create mode 100755 t/t3440-rebase-trailer.sh
>
next prev parent reply other threads:[~2025-11-12 14:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-05 14:29 [PATCH v6 0/4] rebase: support --trailer Li Chen
2025-11-05 14:29 ` [PATCH v6 1/4] interpret-trailers: factor out buffer-based processing to process_trailers() Li Chen
2025-11-05 16:57 ` Junio C Hamano
2025-11-10 16:27 ` Phillip Wood
2025-11-10 19:29 ` Li Chen
2025-11-10 22:08 ` Junio C Hamano
2025-11-10 19:22 ` Li Chen
2025-11-05 14:29 ` [PATCH v6 2/4] trailer: move process_trailers to trailer.h Li Chen
2025-11-05 17:38 ` Junio C Hamano
2025-11-05 14:29 ` [PATCH v6 3/4] trailer: append trailers in-process and drop the fork to `interpret-trailers` Li Chen
2025-11-05 17:56 ` Junio C Hamano
2025-11-10 19:27 ` Li Chen
2025-11-10 16:38 ` Phillip Wood
2025-11-10 19:14 ` Li Chen
2026-02-24 6:36 ` Li Chen
2025-11-11 16:55 ` Phillip Wood
2025-11-05 14:29 ` [PATCH v6 4/4] rebase: support --trailer Li Chen
2025-11-12 14:48 ` Phillip Wood
2025-11-24 15:45 ` Kristoffer Haugsbakk
2026-01-20 20:49 ` Junio C Hamano
2025-11-05 16:30 ` [PATCH v6 0/4] " Junio C Hamano
2025-11-10 19:17 ` Li Chen
2025-11-12 14:50 ` Phillip Wood [this message]
2025-11-17 3:38 ` 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=bfa6c82d-f0b9-4248-88be-8a95bc22ebc1@gmail.com \
--to=phillip.wood123@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=me@linux$(echo .)beauty \
--cc=phillip.wood@dunelm$(echo .)org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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