On Wed, Mar 08, 2023 at 07:39:38AM -0700, Jonathan Corbet wrote: > Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> writes: > > > On Tue, Feb 28, 2023 at 12:14:41PM -0700, Jonathan Corbet wrote: > >> So the patch is worth applying, but I may tweak the changelog some. > > > > I spotted a414684e3b735a4114c19295a07e8cb2eb889dae in next now. You made > > the changelog read: > > > > The "^0" syntax is no longer needed to fast-forward to a mainline commit > > > > I'm willing to bet that ^0 was never needed to force a fast-forward and > > using it was never had an advantage. > > https://lore.kernel.org/lkml/CA+55aFwaxsNZ0ACQkASdDTbSrdcHMJpFPtswK485tEWRBVVYrA@xxxxxxxxxxxxxx/ > > Git has since been changed, as I said before, so that it's no longer > necessary to use the ^0 notation. So I maintain that, while the doc > change was good, the changelog wasn't quite right. Hmm, seems I'd have lost my bet. So it seems there was a time when git made a ff to merge a commit, but it didn't when it was asked to merge a signed tag that points to the same commit. TIL! Seems I have to withdraw my objections to your wording. Thanks Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ |
Attachment:
signature.asc
Description: PGP signature
