Date: Sat, 4 Jul 2026 18:49:10 -0600 From: Warner Losh <imp@bsdimp.com> To: Rick Macklem <rick.macklem@gmail.com> Cc: FreeBSD CURRENT <freebsd-current@freebsd.org> Subject: Re: RFC: How to I set up a branch of main that I can "publish"? Message-ID: <CANCZdfrcsf8GZvb6pa5U8Rak_jxLOex8fNdnA_LFeugG56_k1g@mail.gmail.com> In-Reply-To: <CAM5tNy6mMAKmEORoy-8jnxtq8yuzDWDCzqET=C_OYtjSJ5RBtg@mail.gmail.com> References: <CAM5tNy7i=wBvYDJXrvoPSYuvdthyLP%2BkM0q2rvXmSGxfZUUYrg@mail.gmail.com> <CANCZdfri3vL4t3PoFyE%2BeLq=97KadrxYSH6uU-EfYzk=_pTtBA@mail.gmail.com> <CAM5tNy6mMAKmEORoy-8jnxtq8yuzDWDCzqET=C_OYtjSJ5RBtg@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Sat, Jul 4, 2026 at 3:48 PM Rick Macklem <rick.macklem@gmail.com> wrote: > On Sat, Jul 4, 2026 at 2:19 PM Warner Losh <imp@bsdimp.com> wrote: > > > > > > > > On Sat, Jul 4, 2026 at 3:16 PM Rick Macklem <rick.macklem@gmail.com> > wrote: > >> > >> Hi, > >> > >> I now have a rather large # of commits authored by Vinicius Ferrao > >> for NFS-over-RDMA. They are currently in his fork of freebsd-src > >> on github.com. > >> > >> I do have a simpleton mechanism to get them into a local branch > >> of main, but I do not want to push them to main yet. > >> (Actually, I'd be happy to push them into main, but I have as yet, > >> no way of testing them.) > >> > >> Is there somewhere I can push this stuff so others can clone it? > >> (I can push it to a fork I have of freebsd-src on github.com, but > >> I don't know how to push that to "main"?) > >> > >> I'm git clueless, so any suggestions would be appreciated, rick > > > > > > So usually what people do is to create some named branch (nfs-over-rdma). > > They then push that to a fork of FreeBSD they've setup on their github. > > They then point people at that branch for testing and collaboration. We > don't > > currently allow WIP branches to be pushed either to our source of truth > repo > > or our github mirror. > Ok, I know how to do the above. What I don't know how to do is get that > into > main? (When you say "named branch" is that a branch of a github fork > of freebsd-src > or a named branch of my local clone of main? If it is the latter, I > can see how I can > push it when the time comes, but can I push that to my fork on github?) > git rebase -i main nfs-over-rdma git push freebsd HEAD:main is the simplest way to do that (assuming the FreeBSD source of truth upstream is called 'freebsd'). Or is there something more basic I need to help with? I usually run my branches through Phabricator so I use "git arc stage" to do much the same thing. Warner [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">On Sat, Jul 4, 2026 at 3:48 PM Rick Macklem <<a href="mailto:rick.macklem@gmail.com">rick.macklem@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Sat, Jul 4, 2026 at 2:19 PM Warner Losh <<a href="mailto:imp@bsdimp.com" target="_blank">imp@bsdimp.com</a>> wrote:<br> ><br> ><br> ><br> > On Sat, Jul 4, 2026 at 3:16 PM Rick Macklem <<a href="mailto:rick.macklem@gmail.com" target="_blank">rick.macklem@gmail.com</a>> wrote:<br> >><br> >> Hi,<br> >><br> >> I now have a rather large # of commits authored by Vinicius Ferrao<br> >> for NFS-over-RDMA. They are currently in his fork of freebsd-src<br> >> on <a href="http://github.com" rel="noreferrer" target="_blank">github.com</a>.<br> >><br> >> I do have a simpleton mechanism to get them into a local branch<br> >> of main, but I do not want to push them to main yet.<br> >> (Actually, I'd be happy to push them into main, but I have as yet,<br> >> no way of testing them.)<br> >><br> >> Is there somewhere I can push this stuff so others can clone it?<br> >> (I can push it to a fork I have of freebsd-src on <a href="http://github.com" rel="noreferrer" target="_blank">github.com</a>, but<br> >> I don't know how to push that to "main"?)<br> >><br> >> I'm git clueless, so any suggestions would be appreciated, rick<br> ><br> ><br> > So usually what people do is to create some named branch (nfs-over-rdma).<br> > They then push that to a fork of FreeBSD they've setup on their github.<br> > They then point people at that branch for testing and collaboration. We don't<br> > currently allow WIP branches to be pushed either to our source of truth repo<br> > or our github mirror.<br> Ok, I know how to do the above. What I don't know how to do is get that into<br> main? (When you say "named branch" is that a branch of a github fork<br> of freebsd-src<br> or a named branch of my local clone of main? If it is the latter, I<br> can see how I can<br> push it when the time comes, but can I push that to my fork on github?)<br></blockquote><div><br></div><div><span style="background-color:transparent">git rebase -i main nfs-over-rdma</span></div><div>git push freebsd HEAD:main</div><div><br></div><div>is the simplest way to do that (assuming the FreeBSD source of truth</div><div>upstream is called 'freebsd'). </div><div><br></div><div>Or is there something more basic I need to help with?</div><div><br></div><div>I usually run my branches through Phabricator <span style="background-color:transparent">so I use "git arc stage" to</span></div><div><span style="background-color:transparent">do much the same thing.</span></div><div><br></div><div>Warner</div></div></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrcsf8GZvb6pa5U8Rak_jxLOex8fNdnA_LFeugG56_k1g>