From: Vegard Nossum <vegard.nossum@oracle.com>
To: Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood123@gmail.com>
Cc: Kristoffer Haugsbakk <code@khaugsbakk.name>,
git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH 2/2] sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands
Date: Thu, 8 Feb 2024 09:48:52 +0100 [thread overview]
Message-ID: <ae8d96b7-93b0-4460-b7ed-ffebaddd6f97@oracle.com> (raw)
In-Reply-To: <xmqq8r3wcjq2.fsf@gitster.g>
On 07/02/2024 17:39, Junio C Hamano wrote:
> Phillip Wood <phillip.wood123@gmail.com> writes:
>
>> On 06/02/2024 03:54, Junio C Hamano wrote:
>>> Vegard Nossum <vegard.nossum@oracle.com> writes:
>>>
>>>> On 06/02/2024 00:09, Junio C Hamano wrote:
>>> Perhaps it is a good idea to squash them together as a single bugfix
>>> patch?
>>
>> I think so, I'm not sure we want to add a new test file just for this
>> either. Having the test in a separate file was handy for debugging but
>> I think something like the diff below would suffice though I wouldn't
>> object to checking the author of the cherry-picked commit
>
> Very true (I didn't even notice that the original "bug report
> disguised as a test addition" was inventing a totally new file).
I'm sorry, but I'm confused about what I'm supposed to do now.
There is now another test case and it sounds like you would prefer that
one over mine, but I didn't write it and there is no SOB, so I cannot
submit that with the fix if I were to "squash them together".
I am not a regular contributor so I don't have a good grasp on things
like why you don't want a new test file for this, or why you (as the
maintainer) can't just squash the patches yourself if that's what you
prefer.
Thanks,
Vegard
next prev parent reply other threads:[~2024-02-08 8:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-02 9:18 [PATCH] t/t3515-cherry-pick-rebase.sh: new testcase demonstrating broken behavior Vegard Nossum
2024-02-04 11:14 ` Phillip Wood
2024-02-05 14:13 ` [PATCH 2/2] sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands Vegard Nossum
2024-02-05 14:38 ` Kristoffer Haugsbakk
2024-02-05 23:09 ` Junio C Hamano
2024-02-05 23:14 ` Vegard Nossum
2024-02-06 3:54 ` Junio C Hamano
2024-02-07 14:03 ` Phillip Wood
2024-02-07 16:39 ` Junio C Hamano
2024-02-08 8:48 ` Vegard Nossum [this message]
2024-02-08 14:26 ` Phillip Wood
2024-02-08 17:20 ` Junio C Hamano
2024-02-11 11:11 ` Phillip Wood
2024-02-11 17:05 ` Junio C Hamano
2024-02-15 14:24 ` Vegard Nossum
2024-02-15 17:36 ` Junio C Hamano
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=ae8d96b7-93b0-4460-b7ed-ffebaddd6f97@oracle.com \
--to=vegard.nossum@oracle.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=phillip.wood123@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).