From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id WJfpMJLQWGcBJgAA62LTzQ:P1 (envelope-from ) for ; Tue, 10 Dec 2024 23:36:50 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id WJfpMJLQWGcBJgAA62LTzQ (envelope-from ) for ; Wed, 11 Dec 2024 00:36:50 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=MHM+LJRE; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=enCzhvGa; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733873810; a=rsa-sha256; cv=none; b=YZhC7MajonSrO9aql9jTQJbwu4T5j9nKCwB1wWQLqhfO3B7Ubg3VlA0C4XrQ8rmZqE/G+u PeMvfvi+vUHKGv6/KOoQy9Mws9IBgNjeoLKHUSJ+xHjH9rIVHLhJ95mFxbE5UJ9nd8P6hf ji4ExZb0PepUxjhdWM3Xz2gyn2LkrSdhC349AbT35+/DAR4jJnuysIvxjttmcUYFre67hM 3fogyBsUnqmVFopqDx39XK9czfBR53wAprEPVh43VuloHlfxT6KOXtV68LwsH+er3ay/tG wigNY5eCQXHn/khPADrF/y9D4JppXg7ymaG6iO8D8w7hgaV95/+c9iMKCMobNQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=MHM+LJRE; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=enCzhvGa; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733873810; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=HTZbWmZGhER0Oyu1yj0gCCZqCyXoPAm5/xH3oUx3cMs=; b=A+kOX3zvmbmiINfK5hy1GUMMHwaBOzZeJFlr1nY3bqQPuMJqvO0mRMxj2llAWR6mSIsYt0 2hsJQ8YBQzXqIXbxCHd3uvDBy+CYiH+znc9BYRG9BjKASZ7tpvh4dQB29FVjx1GWiy9f46 U6bOYltXiarqK0t1DMDXVzCEdtjWQ52xX5UaL+UZvHWFPfiR5dW3JmlKQqU1i783tUKkgp L7Q3OfkcsDw0FMSQz4ly/7cRyaxbzBOnPFVz3OSOxoyZgj6IvBvCf8JKgPRhkY2tgpekPm B5nKaeApvWqSTgqxDc1k9r4dRX4N+hwEvY/eQSGgmUCFE1vBPiuaZlPoAinSvw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AEE3385E77 for ; Wed, 11 Dec 2024 00:36:50 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tL9lt-0007pL-Ub; Tue, 10 Dec 2024 18:36:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tL9ls-0007oe-Ie for guix-patches@gnu.org; Tue, 10 Dec 2024 18:36:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tL9ls-0002e0-9k; Tue, 10 Dec 2024 18:36:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=HTZbWmZGhER0Oyu1yj0gCCZqCyXoPAm5/xH3oUx3cMs=; b=MHM+LJREC9YNyHjIM7nWTwpS2R/wDhpQ+Iwx43V+BgukziidHoJ5fepgIfBytBMZATlLpjj4x7MnWI8q7/ZLcHspBrTrHEErzk2B5J9XadzHEYXsn6WZ80PVclFvRM/Fl5KfYl33ExTvJvuD7tpFznnpzPlDYqVYYCVhGZIA9vMZQcXLN5yQRKrfCrMk7mJLNuiJPvqsh3Yb7JjEhP0C/bE8CGUo6qhj/f/S4h8DSndggebqAwaUBPxCaeifmFQVhsima62k/90UN3o5dAYO/yWxwXe6QKF0gBbJ7n/b0/TQfqoNSlcBHR7VQiRYaHFlXuQxLZ2MGhVWyWO8IieleA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tL9lq-0005d9-9Q; Tue, 10 Dec 2024 18:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74776] [PATCH 1/7] git: Remove Guile-Git < 0.4.0 compatibility fallback. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 10 Dec 2024 23:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74776 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74776@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74776-submit@debbugs.gnu.org id=B74776.173387370421053 (code B ref 74776); Tue, 10 Dec 2024 23:36:02 +0000 Received: (at 74776) by debbugs.gnu.org; 10 Dec 2024 23:35:04 +0000 Received: from localhost ([127.0.0.1]:60044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tL9kt-0005TI-IB for submit@debbugs.gnu.org; Tue, 10 Dec 2024 18:35:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tL9ks-0005ST-6A for 74776@debbugs.gnu.org; Tue, 10 Dec 2024 18:35:02 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tL9km-0002P6-VE; Tue, 10 Dec 2024 18:34:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=HTZbWmZGhER0Oyu1yj0gCCZqCyXoPAm5/xH3oUx3cMs=; b=enCzhvGa2rDqptpQtgxO qhZOBnNvm7bHkE9u54M5LXk2DcuuTUe94zPoj8jylY76+RiypPeKIYdsdiQagWnQOtT1XljBzIdCb eru7PuMkID8A1opaRfFDi68a11vARPm5r9nsHCGnbVDW2sx76yDXS8+1l3TdKUdklOcMDNxdsZ0yn OrHAxRCBQxA6SLasW3ruuS4TUksarySK9pESfDVPkDeJ9q2Xr77+fQSy3Fuuws81dfMZ17UP6dQny CZXmAbgiQYFGszZ07rAtNY3JPHmLfNrdpdphp1XPPvPGWvvPtv7M5xPZI8F35FFa4tLQ1bSu0pZUK L55iWsGDHnjxYA==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 11 Dec 2024 00:34:40 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: AEE3385E77 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -3.06 X-Spam-Score: -3.06 X-TUID: 7SDpPkzFG6zQ 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 --- guix/git.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/guix/git.scm b/guix/git.scm index 410cd4c153..1b0839b1e3 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -185,19 +185,13 @@ (define (show-progress progress) (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. -- 2.46.0