From nobody Wed Dec 21 18:33:37 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 4NchxK2Xqqz1GjHD for ; Wed, 21 Dec 2022 18:36:53 +0000 (UTC) (envelope-from parv.0zero9@gmail.com) Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NchxK0hd2z43fv for ; Wed, 21 Dec 2022 18:36:53 +0000 (UTC) (envelope-from parv.0zero9@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x530.google.com with SMTP id d20so23333555edn.0 for ; Wed, 21 Dec 2022 10:36:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=N5dmV5Gl8G/Dfk0lesLu4k6nv6uHIwsWArgGNXfrQuY=; b=OjRHJHlX/BcUGBJ3GSVbgeL++9yPJDb6jnOfYX08LaH2tLUbjCuXhkhIR8cvNGpPgJ P2obMsJcadfpaR8PZWf48kJ4BuljzwX27vToqtmlDvEof/+hRVXzHQreJHT9Tzxrm9Ih 8XhGHNbbSjwNHya1UG6Oi5YBbTiyW/LDqgKnQu25OaGoKw16P04/0NXj2B0rys/v04Zj 99CsGGsIjIf4qd40msB1adpyTa4HUWOgRIHm1tu6XxkHI1tc+/ixdebezo2MKSjplVes EnoO6bywp8uQdxi9r6sHoEAxfVlVzRLAY0aDzpX/OMiJE8TWhBUOEiyGS12tZ8H0F/GJ x6cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=N5dmV5Gl8G/Dfk0lesLu4k6nv6uHIwsWArgGNXfrQuY=; b=QV4MXvHQKDuG912flkKOxHX+PUZ6gJIR7zoYV2IDdP7BLoB7FliEsdar6oVBlDXpkF 92Y7jIUn2k7l/Zui4zjehq9iFhNlkHNPuMXGjwZpitTiSkz6VdkLPzSFFuWuJkCQMaWp h5cYEuMhTkczVjEI3f2uRqMcaj+Vbq/1TWAWqKwWzly/QoTQR3iClBrPUHy9NnCXF8lu l5LTJeMP+nYbw2NIyEL+QeImFBM0h0YHoE2DNsSWsRLvtdaHUnIgCdtTvmhM0PgqbPrv t3wIaHR732TW/Zh4wv21dNyDFwoHFNeFer0K/GRC1n79YAm/fJD1AhlMZJJWKl+3aIqb L6ZQ== X-Gm-Message-State: AFqh2krGHbfGkAp1fmj50yM0SEW+ZTBlWZvLH07Mx2e5iD4avnGZasjW q84b0pAwlOoocDGjmLkYCAK7dAI0QVyMGh4Jdq92kUv418c= X-Google-Smtp-Source: AMrXdXvPvAa5riDN30aAA6zk7pfwO7qDKpWBCT/fr8zbhLhXtDYPdMKM0eQoTWcJJb5xiF2SAW1xyQjBL2qtEs3aPcE= X-Received: by 2002:a05:6402:17d9:b0:468:fb2c:6c8c with SMTP id s25-20020a05640217d900b00468fb2c6c8cmr262750edy.340.1671647811369; Wed, 21 Dec 2022 10:36:51 -0800 (PST) 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 References: <3eae7bee-d0e2-da47-bd15-cf9f72d583ff@nethead.se> In-Reply-To: From: "parv/FreeBSD" Date: Wed, 21 Dec 2022 08:33:37 -1000 Message-ID: Subject: Re: Help with git - fetch earlier src version To: "Edward Sanford Sutton, III" Cc: stable@freebsd.org Content-Type: multipart/alternative; boundary="000000000000fc7f6205f05ad574" X-Rspamd-Queue-Id: 4NchxK0hd2z43fv X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; TAGGED_FROM(0.00)[freebsd] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --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). > ... --000000000000fc7f6205f05ad574 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
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/sho= w_bug.cgi?id=3D268492
> or possibly
> https://bugs.freebsd.org/bugzilla/sho= w_bug.cgi?id=3D267421
> 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?

=C2=A0 =C2=A0If 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 <= br> 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 ...

=C2=A0 git check= out 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 sho= uld not use "reset" again as earlier
(to switch to "stable/13")?=


And, to switch back to "stable/13", use "checkout" o= r "switch" ...

=C2=A0 git switch stable/13
=


- parv

=C2=A0
=C2=A0 =C2=A0I thought --soft should work or excluding that parameter entir= ely 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.=
=C2=A0 =C2=A0You could also create another branch and revert just select co= mmits
from it so you can otherwise include useful changes (presuming they do
not also depend on the reverted changes).
...

--000000000000fc7f6205f05ad574--