Date: Thu, 9 Jun 2022 20:16:33 +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: <YQBPR0101MB974272E446832B22D04ED2C5DDA79@YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM> In-Reply-To: <YqJSsSGqCK2%2Bnh1r@nuc> References: <YQBPR0101MB9742EB96CF32DAD13F6BF2BFDDA79@YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM> <YqJNugFvvSQIxhv1@nuc> <YQBPR0101MB9742C846535025AC97F67B4CDDA79@YQBPR0101MB9742.CANPRD01.PROD.OUTLOOK.COM> <YqJSsSGqCK2%2Bnh1r@nuc>
next in thread | previous in thread | raw e-mail | index | archive | help
Mark Johnston <markj@freebsd.org> wrote:=0A= > On Thu, Jun 09, 2022 at 07:49:53PM +0000, Rick Macklem wrote:=0A= > > 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 invoca= tion.=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= > I'm not sure why you'd need to specify the remote if your first attempt= =0A= > to push to gitrepo.freebsd.org failed, given that "freebsd" presumably=0A= > points to gitrepo anyway.=0A= I looked and, without "freebsd", it uses "https:..." instead of "ssh:...", = so it=0A= is pretty obvious why it failed.=0A= =0A= Thanks for the help, rick=0A= =0A= > Hopefully I haven't screwed anything on the git repo up,=0A= =0A= Looks ok to me. :)=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= =0A=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YQBPR0101MB974272E446832B22D04ED2C5DDA79>