public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>
To: "Li Chen" <me@linux.beauty>,
	"Phillip Wood" <phillip.wood@dunelm.org.uk>,
	git <git@vger.kernel.org>, "Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH v4 01/29] trailer: append trailers in-process and drop the fork to `interpret-trailers`
Date: Tue, 14 Oct 2025 22:43:09 +0200	[thread overview]
Message-ID: <a0fae0cf-a1c0-4086-bcc0-a66f1aedf512@app.fastmail.com> (raw)
In-Reply-To: <20251014122452.1851103-2-me@linux.beauty>

On Tue, Oct 14, 2025, at 14:24, Li Chen wrote:
> From: Li Chen <chenl311@chinatelecom.cn>
>
> Route all trailer insertion through trailer_process() and make
> builtin/interpret-trailers just do file I/O before calling into it.
> amend_file_with_trailers() now shares the same code path.
>
> This removes the fork/exec and tempfile juggling, cutting overhead and
> simplifying error handling. No functional change is intended. It also

Why “is intended” instead of “No functional change.”?

> centralizes logic to prepare for follow-up rebase --trailer patch.
>
> Signed-off-by: Li Chen <chenl311@chinatelecom.cn>
> ---
>  builtin/interpret-trailers.c | 116 ++++++++------------------------
>  trailer.c                    | 125 ++++++++++++++++++++++++++++++++---
>  trailer.h                    |  18 ++++-
>  3 files changed, 157 insertions(+), 102 deletions(-)
>[...]
>  	new_trailers_clear(&trailers);
> diff --git a/trailer.c b/trailer.c
> index 911a81ed99..8aec466b5f 100644
> --- a/trailer.c
> +++ b/trailer.c
> @@ -1224,14 +1224,121 @@ void trailer_iterator_release(struct
> trailer_iterator *iter)
>  	strbuf_release(&iter->key);
>  }
>
> -int amend_file_with_trailers(const char *path, const struct strvec
> *trailer_args)
> +static int amend_strbuf_with_trailers(struct strbuf *buf,
> +									  const struct strvec *trailer_args)

This needs Clang formatting.

>  {
> -	struct child_process run_trailer = CHILD_PROCESS_INIT;
>[snip]

  reply	other threads:[~2025-10-14 20:43 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-14 12:24 [PATCH v4 00/29] rebase: support --trailer Li Chen
2025-10-14 12:24 ` [PATCH v4 01/29] trailer: append trailers in-process and drop the fork to `interpret-trailers` Li Chen
2025-10-14 20:43   ` Kristoffer Haugsbakk [this message]
2025-10-21  9:57     ` Li Chen
2025-10-14 12:24 ` [PATCH v4 02/29] trailer: restore interpret_trailers helper Li Chen
2025-10-14 12:24 ` [PATCH v4 03/29] trailer: drop --trailer prefix handling in amend helper Li Chen
2025-10-14 12:24 ` [PATCH v4 04/29] trailer: move config_head and arg_head to if storage Li Chen
2025-10-14 12:24 ` [PATCH v4 05/29] trailer: use bool for had_trailer_before Li Chen
2025-10-14 12:24 ` [PATCH v4 06/29] interpret-trailers: buffer stdout output Li Chen
2025-10-14 12:24 ` [PATCH v4 07/29] trailer: mirror interpret-trailers output flow Li Chen
2025-10-14 12:24 ` [PATCH v4 08/29] trailer: handle trailer append failures gently Li Chen
2025-10-14 12:24 ` [PATCH v4 09/29] rebase: support --trailer Li Chen
2025-10-14 20:43   ` Kristoffer Haugsbakk
2025-10-22  3:55     ` Li Chen
2025-10-14 12:24 ` [PATCH v4 10/29] rebase: inline trailer state paths Li Chen
2025-10-14 12:24 ` [PATCH v4 11/29] rebase: reuse buffer for trailer args Li Chen
2025-10-14 12:24 ` [PATCH v4 12/29] rebase: drop redundant strbuf_release call Li Chen
2025-10-14 12:24 ` [PATCH v4 13/29] rebase: skip stripping of --trailer option prefix Li Chen
2025-10-14 12:24 ` [PATCH v4 14/29] rebase: die on invalid trailer args Li Chen
2025-10-14 12:24 ` [PATCH v4 15/29] rebase: validate trailers with configured separators Li Chen
2025-10-14 12:24 ` [PATCH v4 16/29] sequencer: add trailers to message before writing file Li Chen
2025-10-14 20:43   ` Kristoffer Haugsbakk
2025-10-14 12:24 ` [PATCH v4 17/29] tests: t3440: create expect files at point of use Li Chen
2025-10-14 20:41   ` Kristoffer Haugsbakk
2025-10-15 13:58     ` Li Chen
2025-10-15 14:02       ` Kristoffer Haugsbakk
2025-10-23  9:04       ` Phillip Wood
2025-10-28 10:26         ` Li Chen
2025-11-03 16:20           ` Phillip Wood
2025-10-14 12:24 ` [PATCH v4 18/29] tests: t3440: check apply backend error includes option Li Chen
2025-10-14 12:24 ` [PATCH v4 19/29] tests: t3440: use test_commit_message for trailer checks Li Chen
2025-10-14 12:24 ` [PATCH v4 20/29] tests: t3440: drop redundant resets and pass branch to rebase where needed Li Chen
2025-10-14 12:24 ` [PATCH v4 21/29] tests: t3440: assert trailer on HEAD after conflict rebase Li Chen
2025-10-14 12:24 ` [PATCH v4 22/29] rebase: persist --trailer options across restarts Li Chen
2025-10-14 12:24 ` [PATCH v4 23/29] tests: t3440: remove redundant --keep-empty Li Chen
2025-10-14 12:24 ` [PATCH v4 24/29] tests: t3440: use helper for trailer checks Li Chen
2025-10-14 12:24 ` [PATCH v4 25/29] tests: t3440: test --trailer without values Li Chen
2025-10-14 13:22   ` Kristoffer Haugsbakk
2025-10-14 12:24 ` [PATCH v4 26/29] tests: t3440: convert ex.com to example.com Li Chen
2025-10-14 12:24 ` [PATCH v4 27/29] tests: t3440: ensure trailers persist after rebase continue Li Chen
2025-10-14 12:24 ` [PATCH v4 28/29] tests: t3440: exercise trailer config mapping Li Chen
2025-10-14 12:24 ` [PATCH v4 29/29] sequencer: honor --trailer with fixup -C Li Chen
2025-10-14 12:31 ` [PATCH v4 00/29] 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=a0fae0cf-a1c0-4086-bcc0-a66f1aedf512@app.fastmail.com \
    --to=kristofferhaugsbakk@fastmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=me@linux.beauty \
    --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