Re: git question: How do I push a cherry-pick of someone else's commit?

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.
> >
>