From: Phillip Wood <phillip.wood123@gmail.com>
To: Nico Williams <nico@cryptonector.com>,
Junio C Hamano <gitster@pobox.com>
Cc: Matt Stark <msta@google.com>,
git@vger.kernel.org, ps@pks.im, phillip.wood@dunelm.org.uk,
Martin von Zweigbergk <martinvonz@google.com>,
remo@buenzli.dev, Edwin Kempin <ekempin@google.com>,
schacon@gmail.com, philipmetzger@bluewin.ch,
konstantin@linuxfoundation.org, newren@gmail.com, tytso@mit.edu,
rikingcoding@gmail.com
Subject: Re: [PATCH] headers: Preserve 'change-id' header in rebase / cherry-pick.
Date: Tue, 7 Apr 2026 10:55:00 +0100 [thread overview]
Message-ID: <68e5a1eb-ec7b-43ca-98d1-ffdf7fef013f@gmail.com> (raw)
In-Reply-To: <adSO6zPwtFOWBcOw@ubby>
On 07/04/2026 05:58, Nico Williams wrote:
>
> Maybe that's the trick: local configuration for determining the
> copy-or-drop semantic for different operations, and maybe hooks for
> altering when copying.
I think the danger with making it configurable is that you cannot rely
on the semantics because they vary between commits created by different
authors. If we could get agreement on
- Should cherry-pick copy the header
- What to do with the header when a commit is split. Three options
spring to mind (1) create new change-ids for all the new commits (2)
create new change-ids but also copy the old one (3) allow the user to
specify which new commit should copy the existing change-id and
create new change-ids for the other commits.
- What to do when commits are squashed - should the new commit copy all
of change-ids? Should it have a new change-id?
Then I think it'd be much clearer what the implementation should do.
Thanks
Phillip
next prev parent reply other threads:[~2026-04-07 9:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-07 3:13 [PATCH] headers: Preserve 'change-id' header in rebase / cherry-pick Matt Stark
2026-04-07 4:09 ` Junio C Hamano
2026-04-07 4:58 ` Nico Williams
2026-04-07 5:02 ` Nico Williams
2026-04-07 14:33 ` Junio C Hamano
2026-04-07 9:55 ` Phillip Wood [this message]
2026-04-07 15:52 ` Nico Williams
2026-04-07 16:20 ` Junio C Hamano
2026-04-07 20:13 ` Nico Williams
2026-04-07 14:42 ` Junio C Hamano
2026-04-07 9:41 ` Phillip Wood
2026-04-07 23:28 ` brian m. carlson
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=68e5a1eb-ec7b-43ca-98d1-ffdf7fef013f@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=ekempin@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=konstantin@linuxfoundation.org \
--cc=martinvonz@google.com \
--cc=msta@google.com \
--cc=newren@gmail.com \
--cc=nico@cryptonector.com \
--cc=philipmetzger@bluewin.ch \
--cc=phillip.wood@dunelm.org.uk \
--cc=ps@pks.im \
--cc=remo@buenzli.dev \
--cc=rikingcoding@gmail.com \
--cc=schacon@gmail.com \
--cc=tytso@mit.edu \
/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