diff options
| author | 宋文武 <iyzsong@member.fsf.org> | 2023-08-17 18:38:23 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@member.fsf.org> | 2023-08-17 18:38:23 +0800 |
| commit | 0ffbdf34567aedb0ae6cef6b869370a415cfaa65 (patch) | |
| tree | 76425d441657ffbc6cfe996144cda706eb997a12 /guix/scripts/pull.scm | |
| parent | d9320de5aa9b77adf5fa31c6429ec8eb08c24458 (diff) | |
| parent | 1b2d43fe016848ea2ec16ff18cbc14340944fc4e (diff) | |
Merge remote-tracking branch 'origin/master' into kde-updates
Diffstat (limited to 'guix/scripts/pull.scm')
| -rw-r--r-- | guix/scripts/pull.scm | 5 |
1 files 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) |