Date: Thu, 7 Jul 2022 11:46:11 -0600 From: Warner Losh <imp@bsdimp.com> To: Kyle Evans <kevans@freebsd.org> Cc: Steve Kargl <sgk@troutmask.apl.washington.edu>, Ryan Stone <rysto32@gmail.com>, FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: buildkernel is broken Message-ID: <CANCZdfrKTxPODmHaebVNDjsNjUTp-7xYSM99rvYmodrqs0x06g@mail.gmail.com> In-Reply-To: <CACNAnaGRfbtyytNqUZQdD9Rg328K--fB-qzox0iRaoSedvB%2BUQ@mail.gmail.com> References: <YsZptHF8tSttpTVy@troutmask.apl.washington.edu> <CAFMmRNz_FjszHNx92vbV9wezBHwT222w2PKO9WwN1zpWciRo5A@mail.gmail.com> <YsbtBZwfBMmltllg@troutmask.apl.washington.edu> <CAFMmRNyWYGD1UoyqMvTnyCnytKFrH9rPcM01Q2YMxhOQkWNd=A@mail.gmail.com> <Ysbyl28nKKlr5Kr2@troutmask.apl.washington.edu> <CAFMmRNyCDzMAcR6dfUAo53399YyaB%2B70ME20oBnOdLAqT-SBEQ@mail.gmail.com> <YscLgscTJlp6I4gf@troutmask.apl.washington.edu> <CANCZdfoA2OGPOMT%2BeD4cjDnQ5DvYeG1Z2iXv-okDB3o_KCSjng@mail.gmail.com> <YscRLGLeeN941jGa@troutmask.apl.washington.edu> <CACNAnaGRfbtyytNqUZQdD9Rg328K--fB-qzox0iRaoSedvB%2BUQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000efcac805e33aa952 Content-Type: text/plain; charset="UTF-8" On Thu, Jul 7, 2022 at 11:21 AM Kyle Evans <kevans@freebsd.org> wrote: > On Thu, Jul 7, 2022 at 10:01 AM Steve Kargl > <sgk@troutmask.apl.washington.edu> wrote: > > > > On Thu, Jul 07, 2022 at 10:37:40AM -0600, Warner Losh wrote: > > > On Thu, Jul 7, 2022 at 10:37 AM Steve Kargl < > > > sgk@troutmask.apl.washington.edu> wrote: > > > > > > > Thanks, but > > > > > > > > root[216] git cherry-pick -n 37f604b49d4a > > > > fatal: bad revision '37f604b49d4a' > > > > root[217] pwd > > > > /usr/src > > > > > > > > > git fetch maybe? > > > > > > > A cursory google search suggests that 'git fetch' > > works on repositories not single files. > > > > Right, the idea is that you `git fetch origin main` (or whatever your > remote is called rather than 'origin') then you can cherry-pick the > revision. fetch will grab the revision without merging it into the > current branch. > Indeed. a git fetch command will only update the remote/origin/upstream tags and such as well as fetching new revisions there. It won't affect any local branches as all until you explicitly merge them with 'git merge' or implicitly with a 'git pull'. Warner > > I did look at the diff associated with 37f604b49d4a. > > I am surprised that the commit that broke buildkernel > > for me was allowed to be committed. The fix in > > 37f604b49d4a seems rather questionable especially given > > that there is no comment about why the macro is expanded > > to a zero-trip loop. > > > > Thanks for the help. I'll just do a 'git pull' > > and start over with a buildworld. > > > > -- > > Steve > > > --000000000000efcac805e33aa952 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Thu, Jul 7, 2022 at 11:21 AM Kyle = Evans <<a href=3D"mailto:kevans@freebsd.org">kevans@freebsd.org</a>> = wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0= px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Thu, J= ul 7, 2022 at 10:01 AM Steve Kargl<br> <<a href=3D"mailto:sgk@troutmask.apl.washington.edu" target=3D"_blank">s= gk@troutmask.apl.washington.edu</a>> wrote:<br> ><br> > On Thu, Jul 07, 2022 at 10:37:40AM -0600, Warner Losh wrote:<br> > > On Thu, Jul 7, 2022 at 10:37 AM Steve Kargl <<br> > > <a href=3D"mailto:sgk@troutmask.apl.washington.edu" target=3D"_bl= ank">sgk@troutmask.apl.washington.edu</a>> wrote:<br> > ><br> > > > Thanks, but<br> > > ><br> > > > root[216] git cherry-pick -n 37f604b49d4a<br> > > > fatal: bad revision '37f604b49d4a'<br> > > > root[217] pwd<br> > > > /usr/src<br> > ><br> > ><br> > > git fetch maybe?<br> > ><br> ><br> > A cursory google search suggests that 'git fetch'<br> > works on repositories not single files.<br> ><br> <br> Right, the idea is that you `git fetch origin main` (or whatever your<br> remote is called rather than 'origin') then you can cherry-pick the= <br> revision. fetch will grab the revision without merging it into the<br> current branch.<br></blockquote><div><br></div><div>Indeed. a git fetch com= mand will only update the remote/origin/upstream</div><div>tags and such as= well as fetching new revisions=C2=A0there. It won't affect any</div><d= iv>local branches as all until you explicitly merge them with 'git merg= e' or</div><div>implicitly with a 'git pull'.</div><div><br></d= iv><div>Warner</div><div>=C2=A0</div><blockquote class=3D"gmail_quote" styl= e=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);paddin= g-left:1ex"> > I did look at the diff associated with 37f604b49d4a.<br> > I am surprised that the commit that broke buildkernel<br> > for me was allowed to be committed.=C2=A0 The fix in<br> > 37f604b49d4a seems rather questionable especially given<br> > that there is no comment about why the macro is expanded<br> > to a zero-trip loop.<br> ><br> > Thanks for the help.=C2=A0 I'll just do a 'git pull'<br> > and start over with a buildworld.<br> ><br> > --<br> > Steve<br> ><br> </blockquote></div></div> --000000000000efcac805e33aa952--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrKTxPODmHaebVNDjsNjUTp-7xYSM99rvYmodrqs0x06g>