From: phillip.wood123@gmail.com
To: Junio C Hamano <gitster@pobox.com>, kristofferhaugsbakk@fastmail.com
Cc: git@vger.kernel.org, Kristoffer Haugsbakk <code@khaugsbakk.name>,
stolee@gmail.com, me@ttaylorr.com,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v2 3/3] sequencer: comment commit messages properly
Date: Wed, 13 Nov 2024 14:49:25 +0000 [thread overview]
Message-ID: <711b59d7-e649-4031-8924-a16fb632b4d4@gmail.com> (raw)
In-Reply-To: <xmqqpln02bee.fsf@gitster.g>
On 13/11/2024 01:03, Junio C Hamano wrote:
> kristofferhaugsbakk@fastmail.com writes:
>
>> From: Kristoffer Haugsbakk <code@khaugsbakk.name>
>>
>
> Describe what happens when a custom comment string is used without
> the fixed code in this space.
It would also be helpful to explain how to trigger the bug [1]
If I remember correctly it was Taylor who first noticed this [2]. If so
we should credit him with a "Reported-by:" trailer.
>> Co-authored-by: Phillip Wood <phillip.wood@dunelm.org.uk>
It seems odd to me to have a "Co-authored-by:" trailer without a
corresponding "Signed-off-by:" If someone has contributed enough to
deserve "Co-authored-by:" then they should be signing off the code they
have contributed. In this case I'd be happy with "Helped-by:" instead
but feel free to add my "Signed-off-by:" if you want to keep
"Co-authored-by:".
Best Wishes
Phillip
[1]
https://lore.kernel.org/git/cfa466b8-a87d-4b5d-b330-6c660897de48@gmail.com/
[2]https://lore.kernel.org/git/ZxlEJ+44M8z03VOj@nand.local/
>> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
>> ---
>
>> +test_expect_success 'conflicting fixup -C after fixup with custom comment string' '
>> + test_config core.commentString COMMENT &&
>> + test_when_finished "test_might_fail git rebase --abort" &&
>> + git checkout --detach A3 &&
>> + test_must_fail env FAKE_LINES="1 fixup 2 fixup_-C 4" git rebase -i A &&
>> + echo resolved >A &&
>> + git add A &&
>> + FAKE_COMMIT_AMEND=edited git rebase --continue &&
>> + test_commit_message HEAD <<-\EOF
>> + A3
>> +
>> + edited
>> + EOF
>> +'
>
> Doing so would allow readers to imagine more easily how this test
> would catch breakages when the code is not fixed (or broken again).
>
> Thanks.
next prev parent reply other threads:[~2024-11-13 14:49 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-23 17:27 [PATCH] sequencer: comment checked-out branch properly kristofferhaugsbakk
2024-10-23 18:44 ` Taylor Blau
2024-10-23 19:53 ` Kristoffer Haugsbakk
2024-10-31 16:30 ` Phillip Wood
2024-10-31 17:25 ` Kristoffer Haugsbakk
2024-10-31 20:30 ` phillip.wood123
2024-10-31 9:58 ` Phillip Wood
2024-10-31 10:07 ` Kristoffer Haugsbakk
2024-10-31 16:30 ` Phillip Wood
2024-10-23 20:43 ` Taylor Blau
2024-10-23 20:51 ` Kristoffer Haugsbakk
2024-11-12 10:20 ` [PATCH v2 0/3] sequencer: comment out properly in todo list kristofferhaugsbakk
2024-11-12 10:20 ` [PATCH v2 1/3] sequencer: comment checked-out branch properly kristofferhaugsbakk
2024-11-13 1:07 ` Junio C Hamano
2024-11-13 1:18 ` Junio C Hamano
2024-11-13 14:47 ` phillip.wood123
2024-11-13 22:57 ` Junio C Hamano
2024-11-24 20:02 ` Kristoffer Haugsbakk
2024-11-12 10:20 ` [PATCH v2 2/3] sequencer: comment `--reference` subject line properly kristofferhaugsbakk
2024-11-13 1:07 ` Junio C Hamano
2024-11-13 14:48 ` phillip.wood123
2024-11-13 23:00 ` Junio C Hamano
2024-11-12 10:20 ` [PATCH v2 3/3] sequencer: comment commit messages properly kristofferhaugsbakk
2024-11-13 1:03 ` Junio C Hamano
2024-11-13 14:49 ` phillip.wood123 [this message]
2024-11-24 19:58 ` Kristoffer Haugsbakk
2024-11-13 0:26 ` [PATCH v2 0/3] sequencer: comment out properly in todo list Junio C Hamano
2024-11-24 20:01 ` Kristoffer Haugsbakk
2024-11-24 20:56 ` [PATCH v3 " kristofferhaugsbakk
2024-11-24 20:56 ` [PATCH v3 1/3] sequencer: comment checked-out branch properly kristofferhaugsbakk
2024-11-24 20:56 ` [PATCH v3 2/3] sequencer: comment `--reference` subject line properly kristofferhaugsbakk
2024-11-24 20:56 ` [PATCH v3 3/3] sequencer: comment commit messages properly kristofferhaugsbakk
2024-11-25 10:07 ` [PATCH v3 0/3] sequencer: comment out properly in todo list phillip.wood123
2024-11-25 10:52 ` Kristoffer Haugsbakk
2024-11-25 14:36 ` phillip.wood123
2024-11-25 20:13 ` [PATCH v4 " kristofferhaugsbakk
2024-11-25 20:13 ` [PATCH v4 1/3] sequencer: comment checked-out branch properly kristofferhaugsbakk
2024-11-25 20:13 ` [PATCH v4 2/3] sequencer: comment `--reference` subject line properly kristofferhaugsbakk
2024-11-25 20:13 ` [PATCH v4 3/3] sequencer: comment commit messages properly kristofferhaugsbakk
2024-11-26 1:11 ` [PATCH v4 0/3] sequencer: comment out properly in todo list Junio C Hamano
2024-11-26 11:24 ` Phillip Wood
2024-11-27 12:39 ` Kristoffer Haugsbakk
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=711b59d7-e649-4031-8924-a16fb632b4d4@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=me@ttaylorr.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=stolee@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).