Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Jun 2022 19:49:53 +0000
From:      Rick Macklem <rmacklem@uoguelph.ca>
To:        Mark Johnston <markj@freebsd.org>
Cc:        freebsd-current <freebsd-current@freebsd.org>, "imp@FreeBSD.org" <imp@freebsd.org>
Subject:   Re: git question: How do I push a cherry-pick of someone else's commit?
Message-ID:  <YQBPR0101MB9742C846535025AC97F67B4CDDA79@YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM>
In-Reply-To: <YqJNugFvvSQIxhv1@nuc>
References:  <YQBPR0101MB9742EB96CF32DAD13F6BF2BFDDA79@YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM> <YqJNugFvvSQIxhv1@nuc>

next in thread | previous in thread | raw e-mail | index | archive | help
Mark Johnston <markj@freebsd.org> wrote:=0A=
>=0A=
> On Thu, Jun 09, 2022 at 07:30:47PM +0000, Rick Macklem wrote:=0A=
> > I just tried to MFC a commit done to fix my commit by imp@=0A=
> > and it won't let be push the cherry-pick.=0A=
> >=0A=
> > What's the trick to doing this?=0A=
>=0A=
> You need to add --push-option=3Dconfirm-author to the git push invocation=
.=0A=
Ok, thanks.=0A=
=0A=
It did try it as the message suggested:=0A=
git push --push-option=3Dconfirm-author=0A=
and it failed because it couldn't push refs to gitrepo.=0A=
=0A=
However, since you suggested it, I did:=0A=
git push freebsd --push-option=3Dconfirm-author=0A=
and that seemed to work.=0A=
=0A=
Hopefully I haven't screwed anything on the git repo up,=0A=
=0A=
Thanks, rick=0A=
=0A=
> Or do I need to get Warner to do it?=0A=
> If so, it's 393b7606f9c1 in main, that needs to go into stable/13.=0A=
>=0A=
> rick=0A=
> ps: The stable/13 build will be broken until this gets resolved.=0A=
>       I'll revert the MFC if it isn't fixed soon.=0A=
>=0A=
=0A=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YQBPR0101MB9742C846535025AC97F67B4CDDA79>