Date: Sat, 1 May 2021 13:36:39 -0600 From: Warner Losh <imp@bsdimp.com> To: Kurt Jaeger <pi@freebsd.org> Cc: Li-Wen Hsu <lwhsu@freebsd.org>, git@freebsd.org Subject: Re: Ports tree have been migrated to git Message-ID: <CANCZdfpGx9SnSVPOBt0e5SOT0rzQbeOd%2BSZeMKTWkrXWZS3KMw@mail.gmail.com> In-Reply-To: <YI2rkuT2W2bpPCpR@fc.opsec.eu> References: <CAKBkRUzXAcXfFuD74VEPG0jAQBrmkQQdqAiBMR21vX3mA%2B4mkQ@mail.gmail.com> <YI2rkuT2W2bpPCpR@fc.opsec.eu>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, May 1, 2021, 1:27 PM Kurt Jaeger <pi@freebsd.org> wrote: > Hi! > > Thanks for posting more details. With some additional posts > in other places, I was finally able to understand most of the > workflow. > > I even use the testing area to test commits 8-} > > > - This is still a young service, please don't treat it too > > aggressively. The testing area is at: > > > > https://cgit-dev.freebsd.org/ports/ > > But right now I'm stuck with the following problem: > > I testbuild by having a default ports tree: > > $ poudriere ports -l > PORTSTREE METHOD TIMESTAMP PATH > default git+https 2021-05-01 21:04:04 /pou/ports/default > > Right now, for reasons that are unclear to me, I still have some > local commit hanging around in that tree that I can't get removed. > > I've used a lot of combinations of > > git rebase > git revert > git reset > > etc, short of removing and re-cloning that tree, because > I'm behind a slow DSL connection and it will take approx. 30minutes > to refetch that ports tree. > > Can someone please help me understand how to just get rid of > some commit not yet pushed ? > git reset --hard HEAD^ removes the last commit from the branch you have checked out. You can put any rev in place of HEAD^ if you know that is where you want to roll back to. You might use "freebsd/main" to reset to upstream (assuming you use the freebsd origin convention). Also, git reflog will remember, for a while, all the branch moves and you can use that to recover those local commits. Warner > -- > pi@FreeBSD.org +49 171 3101372 Now what ? > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpGx9SnSVPOBt0e5SOT0rzQbeOd%2BSZeMKTWkrXWZS3KMw>