From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KF4+NsS2M2HH1AAAgWs5BA (envelope-from ) for ; Sat, 04 Sep 2021 20:11:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id COzeMcS2M2EhNgAAB5/wlQ (envelope-from ) for ; Sat, 04 Sep 2021 18:11:16 +0000 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 6082518C48 for ; Sat, 4 Sep 2021 20:11:16 +0200 (CEST) Received: from localhost ([::1]:34422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMa8J-0007mE-HN for larch@yhetil.org; Sat, 04 Sep 2021 14:11:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMa87-0007f4-0n for guix-patches@gnu.org; Sat, 04 Sep 2021 14:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37002) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMa86-0003Me-Mp for guix-patches@gnu.org; Sat, 04 Sep 2021 14:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mMa86-0003Y2-IK for guix-patches@gnu.org; Sat, 04 Sep 2021 14:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50377] [PATCH 1/2] git: 'resolve-reference' handles 'git describe'-style commit IDs. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Sep 2021 18:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50377 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50377@debbugs.gnu.org Received: via spool by 50377-submit@debbugs.gnu.org id=B50377.163077904513597 (code B ref 50377); Sat, 04 Sep 2021 18:11:02 +0000 Received: (at 50377) by debbugs.gnu.org; 4 Sep 2021 18:10:45 +0000 Received: from localhost ([127.0.0.1]:48545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMa7o-0003XE-W4 for submit@debbugs.gnu.org; Sat, 04 Sep 2021 14:10:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMa7n-0003Wz-Io for 50377@debbugs.gnu.org; Sat, 04 Sep 2021 14:10:44 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39920) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMa7i-00032M-8m for 50377@debbugs.gnu.org; Sat, 04 Sep 2021 14:10:38 -0400 Received: from host-37-191-231-185.lynet.no ([37.191.231.185]:38034 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMa7h-00059v-ST for 50377@debbugs.gnu.org; Sat, 04 Sep 2021 14:10:38 -0400 From: Marius Bakke Date: Sat, 4 Sep 2021 20:10:34 +0200 Message-Id: <20210904181035.24161-1-marius@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210904180845.23915-1-marius@gnu.org> References: <20210904180845.23915-1-marius@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1630779076; 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; bh=IxXig43dW3dyozTf12up4cNMZezbCbQb1Uf4ji4DGoE=; b=JfCxgiFRLhsWNzja967KNJwhviVckA0i7EoypVycMjVLPBJFszToZ76iH2DsvyQBdTsCEO igzfEgY3k82EsgqCTHVlz04+sm4uwllTvxrNI+6y43c2bqZ9PsFdheu+JtRaejX4ynEsDu ENTolffPZezvzrS2rJBT7wka39ZDdMc9OHZzlPInEltr2bquJVvHKhL1R+5qHYCoi415SB /8C70ZjYAjLrLL3hA4Bqu3Dp7yAPPNfPjRS4iw0gkUVo1JDnBfS/la207nXOYXq/rXfpQU MUn4L0LVggAwxG2K/+BIc1s9KCU0o8Z4AwNANrUNvz+AUapb62xgGbLNtDmfmg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630779076; a=rsa-sha256; cv=none; b=I07jaFVbP8Fz6H//zhF6IV4PCy47E6UMcXUPcRjCqtHI44pFHeY23K/s9RPVJZEvShfkiY e/vBASAAh9JZKfsLMlQN+G2eux3dNV3qP9zw904Wk9NSyLszklDDBnr5vbnipZT0PcKdQf K6IWtxuDfbxlxFniBw3EFZdGyR7V5m+7+1UrJe52qlZDj1LlmnN48QmG4R5W6GfdN/sC3m bBij3JH0k0XKgdF5Qm+3cTq7ngTafDeV478b69DIFEv6yA7Xk7R/brDOLH8RX3R1zrSqTz Rn3RNOVpddoAKcxy3SvLxxv2kGGvSBxKn/Yf6uew4kD7K1PbmlTnu6y1rL3ZzA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.42 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 6082518C48 X-Spam-Score: -0.42 X-Migadu-Scanner: scn1.migadu.com X-TUID: qObDugVVT44B * guix/git.scm (resolve-reference): Use REVPARSE-SINGLE for looking up commits. Rewrite tag-or-commit case to recognize 'git describe' style identifiers and resolve them as commits. --- guix/git.scm | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 9c6f326c36..5e52630f5a 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2021 Kyle Meyer +;;; Copyright © 2021 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -214,24 +215,26 @@ corresponding Git object." (let ((oid (reference-name->oid repository symref))) (object-lookup repository oid))) (('commit . commit) - (let ((len (string-length commit))) - ;; 'object-lookup-prefix' appeared in Guile-Git in Mar. 2018, so we - ;; can't be sure it's available. Furthermore, 'string->oid' used to - ;; read out-of-bounds when passed a string shorter than 40 chars, - ;; which is why we delay calls to it below. - (if (< len 40) - (object-lookup-prefix repository (string->oid commit) len) - (object-lookup repository (string->oid commit))))) + (revparse-single repository commit)) (('tag-or-commit . str) - (if (or (> (string-length str) 40) - (not (string-every char-set:hex-digit str))) - (resolve `(tag . ,str)) ;definitely a tag - (catch 'git-error - (lambda () - (resolve `(tag . ,str))) - (lambda _ - ;; There's no such tag, so it must be a commit ID. - (resolve `(commit . ,str)))))) + (cond ((and (> (string-length str) 8) + (string-contains str "-g") + (match (string-split str #\-) + ((components ... g+id) + (string-every char-set:hex-digit + (string-drop g+id 1))) + (_ #f))) + (resolve `(commit . ,str))) ;looks like a 'git describe' style ID + ((or (> (string-length str) 40) + (not (string-every char-set:hex-digit str))) + (resolve `(tag . ,str))) ;definitely a tag + (else + (catch 'git-error + (lambda () + (resolve `(tag . ,str))) + (lambda _ + ;; There's no such tag, so it must be a commit ID. + (resolve `(commit . ,str))))))) (('tag . tag) (let ((oid (reference-name->oid repository (string-append "refs/tags/" tag)))) -- 2.31.1