From owner-freebsd-current@freebsd.org Wed Dec 30 16:04:20 2020 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ACF964C7259 for ; Wed, 30 Dec 2020 16:04:20 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5bh43FM2z3pjx for ; Wed, 30 Dec 2020 16:04:20 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0BUG4HP0053868 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 30 Dec 2020 17:04:19 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Wed, 30 Dec 2020 17:04:17 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: monochrome Cc: freebsd-current@freebsd.org Subject: Re: git and the loss of revision numbers Message-ID: Mail-Followup-To: monochrome , freebsd-current@freebsd.org References: <54116640-E6A1-4C53-9D7E-4384F942628E@ellael.org> <8ABAC674-89AA-47BE-996C-4DF6E7713F21@ellael.org> <53dd689b-2401-8e90-f332-50c60c549c2e@FreeBSD.org> <1d1e2003-0cc1-6e67-0ceb-f0fcba03f8f7@twcny.rr.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <1d1e2003-0cc1-6e67-0ceb-f0fcba03f8f7@twcny.rr.com> User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D5bh43FM2z3pjx X-Spamd-Bar: / X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2020 16:04:20 -0000 On Mon, 2020-12-28 at 19:38:05 -0500, monochrome wrote: >what would be the git command for reverting source to a previous version >using these numbers? for example, with svn and old numbers: >svnlite update -r367627 /usr/src > >this is needed often when it blows up for someone tracking current You need to fetch the git notes, then you can grep them for the SVN rev you're looking for. $ git fetch origin "refs/notes/*:refs/notes/*" && git fetch $ git checkout `git log --format=%h --notes --grep='revision=367627$' main` It's git commit 9aa6d792b549 for reference. >On 12/28/20 11:27 AM, Ed Maste wrote: >> On Mon, 28 Dec 2020 at 07:08, Renato Botelho wrote: >>> >>> FreeBSD bast.garga.net.br 13.0-CURRENT FreeBSD 13.0-CURRENT #19 >>> 3cc0c0d66a0-c255241(main)-dirty: >>> ^ >>> This is an incremental counter of commits >> >> Also, uqs@ recently fixed an issue in newvers.sh (including the final, >> non-updating svn revision) and reordered the information. An example >> of the new format: >> >> main-c255126-gb81783dc98e6-dirty >> \ \ \ \ >> \ \ \ local modifications >> \ \ hash >> \ commit count >> branch Note, the `g` in there is by design, it's the format that git-describe will barf out. hth Uli