On Thu, Jul 7, 2022 at 10:01 AM Steve Kargl <s...@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 < > > s...@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 >