From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id cEQ3AADB9WQVrwAAG6o9tA:P1 (envelope-from ) for ; Mon, 04 Sep 2023 13:35:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id cEQ3AADB9WQVrwAAG6o9tA (envelope-from ) for ; Mon, 04 Sep 2023 13:35:28 +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 6CE8B34711 for ; Mon, 4 Sep 2023 13:35:27 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="Hk+M/RV0"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693827327; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=Rcpl3fY1LXY/pf7TP+7F6W9c9x5Gm0gKEtcqhlKImxI=; b=SluvPyANwHTHw7R2++0alnGQnjuT95WcQLwjTzFfLqVXRSq9alU0K8EHOBUisuVYBV5JZh Dj3pPTUTSSQUTOPG0zgREehlAY+p4bfhaNEJ/I1bT3wJwkbWAgd6b9qxxL0dAo3BqML/lt pjk2ystj9AWXyQuOZY2H0mGMFi79G2BO+UR9rKKlrX0Wrya4sDLsBuCziKafYliBbRZz4D wZO16zcrqNoNSqbvSxiY7W7J5L37yZjQr4Y9flmvni4n7xYkM0+QxqpnbeI4kcVVyAvNQU dWtlabS9fOYBUUuVfkjXPb4ToRvdCczxRB5rbToGy5DxCs9yoDnBRPLHNQCToQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693827327; a=rsa-sha256; cv=none; b=UX7BOTHXPvLgcmBogLro/3tNwtLCxoEpU8GEFuaDlObIgkAbM2eE3FFNsVcMAp1w0eeEbE /lJKy8DUgf9nIpzI2xzJukGaVKQVx6wt8Z6/egwuKOdAXCOiMSBmQwYy8xS5SBWBwXIWxV 6VJpAgpVQwLUpyXu8UZXkDeCZYqBj5zX+OhvAwHieauBdtPBl6vCM5/mz43i4LWQX0mfsq CuqbO/j4wwYzn6fEwDP+UBGph3ax9bdjWCYOaspqyon9rxhWr/GKRrrysuZsf66sc/wt6a Byj+bkUeb891FlTbQZKzxpqUHmisbgr95CeQeWsN/RIT6XBNPO+xIFtAaAKkeg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b="Hk+M/RV0"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qd7rE-0004lG-OE; Mon, 04 Sep 2023 07:35:04 -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 1qd7rD-0004km-85 for guix-patches@gnu.org; Mon, 04 Sep 2023 07:35:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qd7rC-00048D-UZ for guix-patches@gnu.org; Mon, 04 Sep 2023 07:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qd7rC-0001bo-Or for guix-patches@gnu.org; Mon, 04 Sep 2023 07:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65352] Fix time-machine and network Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Sep 2023 11:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65352 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 65352@debbugs.gnu.org Received: via spool by 65352-submit@debbugs.gnu.org id=B65352.16938272946155 (code B ref 65352); Mon, 04 Sep 2023 11:35:02 +0000 Received: (at 65352) by debbugs.gnu.org; 4 Sep 2023 11:34:54 +0000 Received: from localhost ([127.0.0.1]:48951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd7r3-0001bC-Lq for submit@debbugs.gnu.org; Mon, 04 Sep 2023 07:34:53 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qd7r1-0001al-BC for 65352@debbugs.gnu.org; Mon, 04 Sep 2023 07:34:52 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3175e1bb38cso111210f8f.1 for <65352@debbugs.gnu.org>; Mon, 04 Sep 2023 04:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693827285; x=1694432085; darn=debbugs.gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Rcpl3fY1LXY/pf7TP+7F6W9c9x5Gm0gKEtcqhlKImxI=; b=Hk+M/RV0J7T2oObciaSn02WcsWU5klcHsS9yu+gpZ8LClLN8opJF3sLngeikhxNdUN s0C/hAaR6upZe+DpwY8FuW81IUc15cgr6BAbuI/f2RrL8YJm50avgO5DbNUBThaniAJp wWaSLAguAi59bBbaeWuicHODRik9mvrYbpE0hCEyWwrM04l/bGoC66tHBJqiB/1nDxAW 96/ofLiotrvAx4yX7rdNHZA4mHfWjEMV7hApn9fO2vxakISWNyJr21PjFNUHSfhXCUyy Vz7q0I2Yl7ryu8iQjre8OjWc9/jBgN0hAHBCI+1DY/rqp5+iz8sYgP4YB5ZNLHenghBS tX7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693827285; x=1694432085; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Rcpl3fY1LXY/pf7TP+7F6W9c9x5Gm0gKEtcqhlKImxI=; b=KdIghqDO1XpPdiVg3NLZ6oGFStFyI2Ru7M6Fmgiea9C2B0QYwsjLaxcU8rSKED4rL8 bkddb50OO4MwsZLSEO+oYogz555PkD2SdpU8fBkhK39LyFYdlTAeIbP2+6rIsVAHIyc/ UIOG0VbAD8yccA7zxk/xCONOMQL1Mn9IOz14FRB2NbMx0xogO5wPEyAd82RNETqyIfUg YQEZuoWePCB/GTdCZbmWsXktEma+TwVt+Haw9y9R8viIvRyFRHUE32qsxw20/LKJnrTy dBj80rBQVVjZTfVQ9fKGpmEZQ4gQK2wGxvVn0HUE01WghppHGE2xROjR40W8+YCaR83l nLuQ== X-Gm-Message-State: AOJu0YyiEWVdk4f5R0+B1E8A8iZNJkGiWEYRkjEOK2WcjhhxlmBA6Hr4 8U636afM+fSg2y6vuuG8eVRwHnmrv1o= X-Google-Smtp-Source: AGHT+IF01qc4RKJq7F/FW5P6aVKYGGRwDHQxzYKit0WgW1Smas5vVQNIEgrBmdzkBNx0R6fLQQwR3A== X-Received: by 2002:adf:e5c7:0:b0:31d:3669:1c48 with SMTP id a7-20020adfe5c7000000b0031d36691c48mr6440343wrn.7.1693827285302; Mon, 04 Sep 2023 04:34:45 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id h8-20020adff4c8000000b0031c3ee933b5sm14132379wrp.108.2023.09.04.04.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 04:34:44 -0700 (PDT) From: Simon Tournier In-Reply-To: <87wmx6qq5n.fsf_-_@gnu.org> References: <87fs4h4vb9.fsf@gmail.com> <87wmx6qq5n.fsf_-_@gnu.org> Date: Mon, 04 Sep 2023 13:34:41 +0200 Message-ID: <87edjep3xq.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -5.13 X-Spam-Score: -5.13 X-Migadu-Queue-Id: 6CE8B34711 X-TUID: H7j6giJVeY8y --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Ludo, On Mon, 04 Sep 2023 at 10:49, Ludovic Court=C3=A8s wrote: > Houston, we have a problem: This is Houston. Say again, please. :-) > diff --git a/guix/git.scm b/guix/git.scm > index ebe2600209..5fa604f9a0 100644 > --- a/guix/git.scm > +++ b/guix/git.scm > + (() > + (resolve-reference repository > + '(symref . "refs/remotes/origin/HEAD")))))) The fix is to simple return #false when the reference is not resolved. Well, let me now if the attached patch fixes the issue. Cheers, simon --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-guix-git-Add-default-case-when-resolving-reference.patch Content-Transfer-Encoding: quoted-printable Content-Description: p.patch >From e1fdd6748ebb1088fb805d77cfb176758bab5618 Mon Sep 17 00:00:00 2001 Message-Id: From: Simon Tournier Date: Mon, 4 Sep 2023 13:23:59 +0200 Subject: [PATCH] guix: git: Add default case when resolving reference. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit Reported by Ludovic Court=C3=A8s . * guix/git.scm (resolve-reference): Return #false when the reference is not resolved. --- guix/git.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/git.scm b/guix/git.scm index ebe2600209d4..d4076d4a0a0c 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -282,7 +282,8 @@ (define (resolve-reference repository ref) (if (=3D OBJ-TAG (object-type obj)) (object-lookup repository (tag-target-id (tag-lookup repository oid))) - obj)))))) + obj))) + (_ #f)))) =20 (define (switch-to-ref repository ref) "Switch to REPOSITORY's branch, commit or tag specified by REF. Return = the base-commit: bedcdf0fb5ac035f696790827679406c7146396c --=20 2.38.1 --=-=-=--