Date: Thu, 7 Jul 2022 10:21:43 -0700 From: Kyle Evans <kevans@freebsd.org> To: sgk@troutmask.apl.washington.edu Cc: Warner Losh <imp@bsdimp.com>, Ryan Stone <rysto32@gmail.com>, FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: buildkernel is broken Message-ID: <CACNAnaGRfbtyytNqUZQdD9Rg328K--fB-qzox0iRaoSedvB%2BUQ@mail.gmail.com> In-Reply-To: <YscRLGLeeN941jGa@troutmask.apl.washington.edu> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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. > 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 >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACNAnaGRfbtyytNqUZQdD9Rg328K--fB-qzox0iRaoSedvB%2BUQ>