From owner-dev-commits-src-main@freebsd.org Wed Dec 30 21:06:59 2020 Return-Path: Delivered-To: dev-commits-src-main@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 4F31F4CEBF3; Wed, 30 Dec 2020 21:06:59 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5kPH1M7cz4fsq; Wed, 30 Dec 2020 21:06:58 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: by mail-qk1-f173.google.com with SMTP id n142so14980673qkn.2; Wed, 30 Dec 2020 13:06:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=RkEUrcYcxi3j2ab4i1/m8qzSBTyHhz1BEYMGLIT1FDw=; b=cbchAbhq66kNYmEnfz5oeBBmRT5iBQLSJtAWb0+3Lco1Q7Mjn5RBoGAddS42tM/pG1 iAM++fDnGUlM6Mb5yjES2Dl41JbVvfVKOxSGiGIORgOm47cP0mXz/zampBJeqFxnZUah xx3XGxol1/u7B5bfluBLe9AC2yfRaDM35KX30NNNlfV/fa8YNmqHhSXG2yDhumegeZ52 fzIS+E/hQWGA+HAc3YBfBn3T6PCFxQSodqQ+IYIPo8n97nY8SzOQa/+z9oa75DE2sKuc LUBNIDi/qD27lAwSBKM/cz9khMBJ3rTagPyyMV4JJ0Ektdtaf+zQcbku0+boip2P4hKF DZxA== X-Gm-Message-State: AOAM533jWjWZ8xAMOwXIlOUQR/oNsG/Mz1jOtPyPXl/xjhz4jrxIW5W0 VLusnu9qac4LmeUSH0HEtbOXSI10CMfodA== X-Google-Smtp-Source: ABdhPJwSgQyp7y796kIWySrTbga/hPTE3ECw2fJayCgzUo0M+YTezglo288rTMjAOrT9WW4fOJ7okA== X-Received: by 2002:a05:620a:22ab:: with SMTP id p11mr55082813qkh.237.1609362417918; Wed, 30 Dec 2020 13:06:57 -0800 (PST) Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com. [209.85.222.176]) by smtp.gmail.com with ESMTPSA id z26sm27314644qki.40.2020.12.30.13.06.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 30 Dec 2020 13:06:57 -0800 (PST) Received: by mail-qk1-f176.google.com with SMTP id c7so14992574qke.1; Wed, 30 Dec 2020 13:06:57 -0800 (PST) X-Received: by 2002:a37:6189:: with SMTP id v131mr53421779qkb.337.1609362417448; Wed, 30 Dec 2020 13:06:57 -0800 (PST) MIME-Version: 1.0 References: <202012301204.0BUC4qX7081946@gndrsh.dnsmgr.net> In-Reply-To: From: Ryan Libby Date: Wed, 30 Dec 2020 13:06:46 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 70e64ba44941 - main - release.sh: Update GITROOT URL To: Warner Losh Cc: "Rodney W. Grimes" , Glen Barber , Kyle Evans , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4D5kPH1M7cz4fsq X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the main branch of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2020 21:06:59 -0000 On Wed, Dec 30, 2020 at 11:00 AM Warner Losh wrote: > > On Wed, Dec 30, 2020 at 5:04 AM Rodney W. Grimes > wrote: > > Now what is being just shoved off as nothing is the fact without > > $FreeBSD$ working the ability to backtrace cadence of a file is > > going to be a royal pain in the ass, and basically means the project > > has "lost" versioning of installed product. > > > > You can commit the file you have to a temporary branch, and use a simple > loop to find the file that's closest to it in the main branch with git > tools. It's not that hard and covered in several stack trace posts. It's > far more reliable than $FreeBSD$ since it will show the version that's the > closest to the one you have, in case you moved other later changes in w/o > updating $FreeBSD$. If there's a need for this, it might be useful to describe in or link from the freebsd-git-docs. For exact matches, this almost works: git describe $(git hash-object $file) but not for all branches, I think for git describe $blob you have to be on a branch with the blob in history. It might also come with some caveats about the hash format. We might be able either to add some glue around that or work with git upstream. Having a tool to find fuzzy matches would be neat (the blob with the minimum diff). Does one exist? Ryan