[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65352] Fix time-machine and network
From: |
Simon Tournier |
Subject: |
[bug#65352] Fix time-machine and network |
Date: |
Mon, 04 Sep 2023 13:34:41 +0200 |
Hi Ludo,
On Mon, 04 Sep 2023 at 10:49, Ludovic Courtès <ludo@gnu.org> 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:
<e1fdd6748ebb1088fb805d77cfb176758bab5618.1693826861.git.zimon.toutoune@gmail.com>
From: Simon Tournier <zimon.toutoune@gmail.com>
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 <ludo@gnu.org>.
* 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