From nobody Thu Dec 22 00:12:48 2022 X-Original-To: stable@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NcrP03fWVz1G64f for ; Thu, 22 Dec 2022 00:12:52 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NcrNz5kkcz3tBB for ; Thu, 22 Dec 2022 00:12:51 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 3.97.99.33) smtp.mailfrom=cy.schubert@cschubert.com; dmarc=none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTP id 85KipHDlcl2xS89Cdp8iEd; Thu, 22 Dec 2022 00:12:51 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id 89CbpJGJScyvu89Ccp3xnk; Thu, 22 Dec 2022 00:12:51 +0000 X-Authority-Analysis: v=2.4 cv=VbHkgXl9 c=1 sm=1 tr=0 ts=63a3a103 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=sHyYjHe8cH0A:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=kdeQEVxe8KDPTjXVwYIA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 1C4A2D1; Wed, 21 Dec 2022 16:12:49 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id BC31718F; Wed, 21 Dec 2022 16:12:48 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: "parv/FreeBSD" cc: "Edward Sanford Sutton, III" , stable@freebsd.org Subject: Re: Help with git - fetch earlier src version In-reply-to: References: <3eae7bee-d0e2-da47-bd15-cf9f72d583ff@nethead.se> Comments: In-reply-to "parv/FreeBSD" message dated "Wed, 21 Dec 2022 08:33:37 -1000." List-Id: Production branch of FreeBSD source code List-Archive: https://lists.freebsd.org/archives/freebsd-stable List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-stable@freebsd.org X-BeenThere: freebsd-stable@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 21 Dec 2022 16:12:48 -0800 Message-Id: <20221222001248.BC31718F@slippy.cwsent.com> X-CMAE-Envelope: MS4xfNeTNOCEL462a4wdxXLJyP6GHzZLHGWlTHoZW4pj9ERxbL5/avsTD3DAvwMmki+0h9Q9LZhYkYJvkGxvwceCcyDYN8q/zvYlHDEOL0fiulTFO2VpFOcl oxzQfsNA8vRFs039Nq2p/wh8RliV9ETl3q3H0EhRIS4NlzecuEFzAasvQa3w49HmKXDy/p/k88no8RK8rXiX4VZn49Yj4kbBBMG1XyudDQb7mxG4TU17V80y 1PmWU2qkjfxbLNBlqU3i609AT1yikQygM02qFjFoG38= X-Spamd-Result: default: False [-1.78 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-0.999]; NEURAL_HAM_SHORT(-0.98)[-0.981]; MV_CASE(0.50)[]; RCVD_IN_DNSWL_MED(-0.20)[3.97.99.33:from]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[freebsd]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; TO_MATCH_ENVRCPT_SOME(0.00)[]; REPLYTO_EQ_FROM(0.00)[]; R_SPF_NA(0.00)[no SPF record]; RCVD_COUNT_FIVE(0.00)[5]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; ARC_NA(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MLMMJ_DEST(0.00)[stable@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; FREEMAIL_CC(0.00)[hotmail.com,freebsd.org] X-Rspamd-Queue-Id: 4NcrNz5kkcz3tBB X-Spamd-Bar: - X-ThisMailContainsUnwantedMimeParts: N In message , "parv/FreeBSD" writes: > --000000000000fc7f6205f05ad574 > Content-Type: text/plain; charset="UTF-8" > > On Wed, Dec 21, 2022 at 5:09 AM Edward Sanford Sutton, III wrote: > > > On 12/21/22 05:56, Per olof Ljungmark wrote: > > > I am facing the same issue as in > > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268492 > > > or possibly > > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267421 > > > with a T490 laptop. > > > > > > Can someone please help with the git command to fetch an earlier > > > version, for example the one for the amd64 December 9th. snapshot? > > > > If you already have a checkout of stable/13, you made no local > > changes, you don't share that repo with anyone, and wanted to roll it > > back to a76fa7bb6cb721bcccc257ddbc4398d25dc8def8 which came 2022-12-08 > > 01:18:32 +0000 just before a linuxkpi patch: > > > > git reset --hard a76fa7bb6cb721bcccc257ddbc4398d25dc8def8 > > > > "reset"? Would "checkout" not work ... > > git checkout a76fa7bb6cb721bcc > > ... ? > > When you want to return to the previous state you can run: > > > > git merge > > > > > "merge" would add a useless point in the history, as I see no changes > being made or suggested. Why should not use "reset" again as earlier > (to switch to "stable/13")? > > > And, to switch back to "stable/13", use "checkout" or "switch" ... > > git switch stable/13 > > > - parv > > > > > I thought --soft should work or excluding that parameter entirely to > > change your tree to that commit and that --hard destroys records of > > future commits from your git tree but that doesn't seem to be the case. > > You could also create another branch and revert just select commits > > from it so you can otherwise include useful changes (presuming they do > > not also depend on the reverted changes). > > > ... git checkout -b my_revision GIT_HASH is the best option allowing you to switch back and forth without incurring the overhead of a merge commit. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0