From patchwork Mon Sep 4 11:34:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 53436 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C49F327BBE9; Mon, 4 Sep 2023 12:35:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BF55627BBE2 for ; Mon, 4 Sep 2023 12:35:27 +0100 (BST) 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 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi Ludo, On Mon, 04 Sep 2023 at 10:49, Ludovic Courtès 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 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=UTF-8 Content-Transfer-Encoding: 8bit Reported by Ludovic Courtès . * 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 (= OBJ-TAG (object-type obj)) (object-lookup repository (tag-target-id (tag-lookup repository oid))) - obj)))))) + obj))) + (_ #f)))) (define (switch-to-ref repository ref) "Switch to REPOSITORY's branch, commit or tag specified by REF. Return the base-commit: bedcdf0fb5ac035f696790827679406c7146396c -- 2.38.1