On 13/11/2024 01:03, Junio C Hamano wrote:
kristofferhaugsbakk@xxxxxxxxxxxx writes:
From: Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>
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@xxxxxxxxx/
[2]https://lore.kernel.org/git/ZxlEJ+44M8z03VOj@nand.local/
Signed-off-by: Kristoffer Haugsbakk <code@xxxxxxxxxxxxxxx>
---
+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.
