guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: pull: Tag commit argument with 'tag-or-commit.


From: guix-commits
Subject: 02/03: pull: Tag commit argument with 'tag-or-commit.
Date: Wed, 16 Aug 2023 21:40:30 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit ecab937897385fce3e3ce0c5f128afba4304187c
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Aug 15 14:43:11 2023 -0400

    pull: Tag commit argument with 'tag-or-commit.
    
    For compatibility with (guix git) procedures.
    
    * guix/scripts/pull.scm (channel-list): Also accept tag-or-commit tagged
    refspec.
---
 guix/scripts/pull.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index ecd264d3fa..9b78d4b5ca 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -166,7 +166,7 @@ Download and deploy the latest version of Guix.\n"))
                                (alist-delete 'repository-url result))))
          (option '("commit") #t #f
                  (lambda (opt name arg result)
-                   (alist-cons 'ref `(commit . ,arg) result)))
+                   (alist-cons 'ref `(tag-or-commit . ,arg) result)))
          (option '("branch") #t #f
                  (lambda (opt name arg result)
                    (alist-cons 'ref `(branch . ,arg) result)))
@@ -774,7 +774,8 @@ Use '~/.config/guix/channels.scm' instead."))
                (if (guix-channel? c)
                    (let ((url (or url (channel-url c))))
                      (match ref
-                       (('commit . commit)
+                       ((or ('commit . commit)
+                            ('tag-or-commit . commit))
                         (channel (inherit c)
                                  (url url) (commit commit) (branch #f)))
                        (('branch . branch)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]