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>
index | next in thread | previous in thread | raw e-mail
Mark Johnston <markj@freebsd.org> wrote: > On Thu, Jun 09, 2022 at 07:49:53PM +0000, Rick Macklem wrote: > > Mark Johnston <markj@freebsd.org> wrote: > > > > > > On Thu, Jun 09, 2022 at 07:30:47PM +0000, Rick Macklem wrote: > > > > I just tried to MFC a commit done to fix my commit by imp@ > > > > and it won't let be push the cherry-pick. > > > > > > > > What's the trick to doing this? > > > > > > You need to add --push-option=confirm-author to the git push invocation. > > Ok, thanks. > > > > It did try it as the message suggested: > > git push --push-option=confirm-author > > and it failed because it couldn't push refs to gitrepo. > > > > However, since you suggested it, I did: > > git push freebsd --push-option=confirm-author > > and that seemed to work. > > I'm not sure why you'd need to specify the remote if your first attempt > to push to gitrepo.freebsd.org failed, given that "freebsd" presumably > points to gitrepo anyway. I looked and, without "freebsd", it uses "https:..." instead of "ssh:...", so it is pretty obvious why it failed. Thanks for the help, rick > Hopefully I haven't screwed anything on the git repo up, Looks ok to me. :) > Thanks, rick > > > Or do I need to get Warner to do it? > > If so, it's 393b7606f9c1 in main, that needs to go into stable/13. > > > > rick > > ps: The stable/13 build will be broken until this gets resolved. > > I'll revert the MFC if it isn't fixed soon. > > >help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YQBPR0101MB974272E446832B22D04ED2C5DDA79>