From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id aLt1OQojdmT8PAEASxT56A (envelope-from ) for ; Tue, 30 May 2023 18:23:39 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id +HKSOQojdmSnegEAauVa8A (envelope-from ) for ; Tue, 30 May 2023 18:23:38 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8FAC52C970 for ; Tue, 30 May 2023 18:23:38 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4287-0000MY-5u; Tue, 30 May 2023 12:23:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q427t-00009x-97 for bug-guix@gnu.org; Tue, 30 May 2023 12:23:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q427i-0005mm-PO for bug-guix@gnu.org; Tue, 30 May 2023 12:23:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q427i-0003Rs-Kd for bug-guix@gnu.org; Tue, 30 May 2023 12:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#63775: git describe on current master says: v1.3.0-38775-g6192acf8b7 Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 30 May 2023 16:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63775 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Janneke Nieuwenhuizen , 63775@debbugs.gnu.org Received: via spool by 63775-submit@debbugs.gnu.org id=B63775.168546374113176 (code B ref 63775); Tue, 30 May 2023 16:23:02 +0000 Received: (at 63775) by debbugs.gnu.org; 30 May 2023 16:22:21 +0000 Received: from localhost ([127.0.0.1]:34011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4272-0003QQ-LZ for submit@debbugs.gnu.org; Tue, 30 May 2023 12:22:21 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:40342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4270-0003Q6-4g for 63775@debbugs.gnu.org; Tue, 30 May 2023 12:22:19 -0400 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-3f604176322so7093095e9.1 for <63775@debbugs.gnu.org>; Tue, 30 May 2023 09:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685463732; x=1688055732; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=nkHTVsmWIGebt78cL/Y4ixD/g8d/XweK3GZgQC9elAY=; b=SDSFKUkO8OiT0CAVj8LCeJGbLeXquKDD0MVJELFUdwcDPy8/pMLH9w/sr/QW+0e2Lb z8vjFeRFusaslb3B4ERelScyiCJ1HvZYQzeeacSnGsfkJ4ogZU4eHiG3XHF4I+Fo1g/A yMQvM+UCf+xAyToGiINcz3dpVTIwHPYn+Oxh9WpW+FVR5AHrZ+4NID/DDwKAQRcHxBmE sLEUyL49l1UMD6pCRyM+4ivddBsrO0RfNI6RkLWR5DBQt0S+p0ldMNWUnDYltkcJdPJK R15MEJNDZd0fj1VEQFdZqo7VUGOI9+knhKPC2CBdR2hU20/NpUeB9dCiXitmbN2Ny2c4 5dog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685463732; x=1688055732; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:to:from:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=nkHTVsmWIGebt78cL/Y4ixD/g8d/XweK3GZgQC9elAY=; b=LWuw933GvNtnWxsD/ZGh/bR5MzlS8RVrhgL1KltNVqs9LaMw4ZmCjUmM/mOd28Tcby CXX56Hwci8OnGHJf7P6iooAXzpkp/cwm1j1+ozuBAXsh4vGf0v5SuuGnVwRl0PI+1NlQ 3lqLM/iQA5ivH3PIxnfI1/EBBFeDWTNSrxfIa1sLG79F7HXOJuYg5uxEylTVqS7IMDNI JeACXhPMi83v7m3UIMtFm8wcz8XQZ9DbaxGBh4olv9ZubtalOgutl8Q8Y4Vp98QX/w/Q pStz5S1Nc5UFRB05TTt+gYV9R52ikZEygrxuo10n7lBf8ZbG1Em1mQCZFo0n99c0Kdhl 5/0Q== X-Gm-Message-State: AC+VfDxXfrsnhEACCrwXgEaRw7ansCGrhmLvkvhVUnxwPdeOqh4iH4ur ThZjFXogr/6bovnNs9aAudzHXA3XPps= X-Google-Smtp-Source: ACHHUZ4DnKj+sJ4szplZeMTzs7DAlejOQjxYVpngBK56jdXcVZ+2s7C3HMn0WpTbbNxZxY6mVd+Ecg== X-Received: by 2002:a05:600c:1c98:b0:3f4:f204:4968 with SMTP id k24-20020a05600c1c9800b003f4f2044968mr2454562wms.1.1685463732217; Tue, 30 May 2023 09:22:12 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id n4-20020a05600c294400b003f3157988f8sm17557696wmd.26.2023.05.30.09.22.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 09:22:11 -0700 (PDT) From: Simon Tournier In-Reply-To: <87pm6k5vwn.fsf@gnu.org> References: <87pm6k5vwn.fsf@gnu.org> Date: Tue, 30 May 2023 17:25:01 +0200 Message-ID: <87jzwpsuya.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1685463818; a=rsa-sha256; cv=none; b=PsMCy1FhYwHoAnwRATU7SwVOMozoIX5TgJ0BGjbNSH9JYBDxLGMndtQZO/J8XqV5q6XWyk fvZ/SUJ2cAqWYa+JuW91GsaWTiW0GSvuAs7BwNl+w2vgKnTByn7RZPoa9Y2UOEnbDoCQGa XX3vAmtNfAED1i4MKi8QLdrPuxlmXkGUHtIcrFb//qcYAjqz3UYQSxmG9Z9Zzp1BsfUJn8 6OEYZafOtM9ODj3IDPKkCPInm++h0cpHH/8IIVNxukTUQ4gu6LHYAgT+pYceYexByMR00V qt0XprWaNBm0apqjmEAr0PjHhqcMZ9Pqr1BO+O6iRyk8zE8qqJ7DgY0fEwP2ug== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=SDSFKUkO; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1685463818; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=nkHTVsmWIGebt78cL/Y4ixD/g8d/XweK3GZgQC9elAY=; b=I4QN2eMo8P8u6pqLZ61CiNGe3ZBcTCBMI04nkY+VRzGdyBuovKHKp6CchjrT9uOAYfk/hn LhHPheIgrbWUC8jpl6EGf68hWmLcVwckNgnaBWiSdTqskpJl9XOaTuDDtM7V7yBJBoCAQN fPzDDqwMZHnn/iXaZ00vrEjSQQwCceOCgC/eiQHGcRhO50hBaM+2FMpdOk1B8Pd2X6TsgX HT57E3StdCp7a00TxY1LBJKFgoslaWwJhQORKNl/oz2H7i/21vYGFAcjsD81ySREkYpUpg pgUVfSn6XSLxwjJ9wOI3vjLF1EEDQIcDXk7JYJghKmhe/xxJ/4Yyw2ZBjwHLRw== X-Migadu-Spam-Score: -1.04 X-Spam-Score: -1.04 X-Migadu-Queue-Id: 8FAC52C970 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=SDSFKUkO; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-TUID: Lny1mM/J/OJF Hi, On dim., 28 mai 2023 at 17:16, Janneke Nieuwenhuizen wrot= e: > --8<---------------cut here---------------start------------->8--- > 17:12:25 janneke@drakenpad:~/src/guix/master [env] > $ git fetch origin > 17:12:56 janneke@drakenpad:~/src/guix/master [env] > $ git fetch origin --tags > 17:13:04 janneke@drakenpad:~/src/guix/master [env] > $ git reset --hard origin/master > HEAD is now at 6192acf8b7 gnu: telegram-desktop: Update to 4.8.1 > 17:13:09 janneke@drakenpad:~/src/guix/master [env] > $ git describe > v1.3.0-38775-g6192acf8b7 > --8<---------------cut here---------------end--------------->8--- Oh, that=E2=80=99s weird! --8<---------------cut here---------------start------------->8--- $ git describe --debug describe HEAD No exact match on refs or tags, searching to describe annotated 38817 v1.3.0 annotated 38831 v1.3.0rc2 annotated 38870 v1.3.0rc1 annotated 55660 base-for-issue-62196 annotated 55806 v1.2.0 annotated 55814 v1.2.0rc2 annotated 55837 v1.2.0rc1 annotated 55985 v1.4.0 annotated 55998 v1.4.0rc2 annotated 56031 v1.4.0rc1 traversed 56356 commits more than 10 tags found; listed 10 most recent gave up search at d62c9b2671be55ae0305bebfda17b595f33797f2 v1.3.0-38817-g76b7bc5392 $ git rev-list --count v1.3.0..HEAD 38817 --8<---------------cut here---------------end--------------->8--- The manual reads, SEARCH STRATEGY [...] If an exact match was not found, git describe will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor=E2=80=99s tag will be outp= ut along with an abbreviation of the input commit-ish=E2=80=99s SHA-1. If --first-parent was specified then the walk will only consider the first parent of each commit. If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output. Here fewest commits different is defined as the number of commits which would be shown by git log tag..input will be the smallest number of commits possible. And then, --8<---------------cut here---------------start------------->8--- $ git rev-list --count v1.4.0..HEAD 9980 --8<---------------cut here---------------end--------------->8--- Hum, why does =E2=80=9Cgit describe=E2=80=9D count 55985? Well, it=E2=80= =99s weird, for instance, using my repository, the DAG looks like: --8<---------------cut here---------------start------------->8--- $ git --no-pager log --all --graph --simplify-by-decoration --format=3D"%h = %d" * 76b7bc5392 (HEAD -> master) * 2b1b0a580d (origin/master, origin/HEAD) | * ecb19e3353 (origin/tex-team-next) | * bb07562a89 (origin/tex-team) |/=20=20 [...] * 45fd01ac5d (tag: base-for-issue-62196) [...] | * d8abcffda5 (origin/wip-guile-ssh-0.16) |/=20=20 | * e81a75a7b2 (origin/wip-r) |/=20=20 * 989a3916dc (origin/version-1.4.0) * 8e2f32cee9 (tag: v1.4.0)=20=20 * 7866294e32 (tag: v1.4.0rc2) * 020184fd39 (tag: v1.4.0rc1) | * 7966084069 (origin/wip-aarch64-bootstrap) [...] | * 8d84a9ee71 (origin/version-1.2.0) | | * aa34d4d28d (origin/version-1.3.0) | |/=20=20 |/|=20=20=20 | | * 592101268f (origin/wip-ppc) | |/=20=20 |/|=20=20=20 * | a0178d34f5 (tag: v1.3.0) * | 7a65beff0f (tag: v1.3.0rc2) * | 0d353b06ec (tag: v1.3.0rc1) |/=20=20 | * fafad6b17c (origin/wip-node-importer) --8<---------------cut here---------------end--------------->8--- Therefore, I would be expecting that the tag =E2=80=99base-for-issue-62196= =E2=80=99 would be the output of =E2=80=9Cgit describe=E2=80=9D. > (There was a question on IRC by cassio: "How do I upgrade to 1.4", > but I don't see it in the channel logs yet). Well, about upgrading to 1.4, it depends from which Guix revision. :-) Something like, guix pull --commit=3D8e2f32cee982d42a79e53fc1e9aa7b8ff0514714 should do the job. And if not, the answer will depend on the current Guix revision which requires an update. Cheers, simon