~ruther/guix-local

ecab937897385fce3e3ce0c5f128afba4304187c — Maxim Cournoyer 2 years ago addffd0
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.
1 files changed, 3 insertions(+), 2 deletions(-)

M guix/scripts/pull.scm
M guix/scripts/pull.scm => guix/scripts/pull.scm +3 -2
@@ 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)