diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2024-12-10 23:18:31 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-12-25 23:51:10 +0100 |
| commit | 36b8539977d8c2deea004094d3ea6302b58ddea1 (patch) | |
| tree | 7136dde5433a55033e47b891a92ea5da6ab53c97 | |
| parent | a75b2d614a405b7ba11797377d6eb140519b84ee (diff) | |
git: Remove Guile-Git < 0.4.0 compatibility fallback.
Guile-Git 0.4.0 was released in October 2020.
* guix/git.scm (make-default-fetch-options): Remove
‘wrong-number-of-args’ fallback.
Change-Id: I5ebcb7212fd96241ea5defc4127e9880a6dd9667
| -rw-r--r-- | guix/git.scm | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/guix/git.scm b/guix/git.scm index 410cd4c153e..1b0839b1e36 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -185,19 +185,13 @@ the 'SSL_CERT_FILE' and 'SSL_CERT_DIR' environment variables." (define (make-default-fetch-options) "Return the default fetch options." (let ((auth-method (%make-auth-ssh-agent))) - ;; The #:transfer-progress and #:proxy-url options appeared in Guile-Git - ;; 0.4.0. Omit them when using an older version. - (catch 'wrong-number-of-args - (lambda () - (make-fetch-options auth-method - ;; Guile-Git doesn't distinguish between these. - #:proxy-url (or (getenv "http_proxy") - (getenv "https_proxy")) - #:transfer-progress - (and (isatty? (current-error-port)) - show-progress))) - (lambda args - (make-fetch-options auth-method))))) + (make-fetch-options auth-method + ;; Guile-Git doesn't distinguish between these. + #:proxy-url (or (getenv "http_proxy") + (getenv "https_proxy")) + #:transfer-progress + (and (isatty? (current-error-port)) + show-progress)))) (define GITERR_HTTP ;; Guile-Git <= 0.5.2 lacks this constant. |