From unknown Sun Jun 22 00:46:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59145] [PATCH] gnu: emacs-magit: Fix tests. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Nov 2022 08:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59145@debbugs.gnu.org Cc: "\(" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166798108027997 (code B ref -1); Wed, 09 Nov 2022 08:05:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Nov 2022 08:04:40 +0000 Received: from localhost ([127.0.0.1]:38927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1osg4d-0007HU-Q3 for submit@debbugs.gnu.org; Wed, 09 Nov 2022 03:04:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:44908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1osg4c-0007HN-2s for submit@debbugs.gnu.org; Wed, 09 Nov 2022 03:04:38 -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 1osg4X-0005OZ-OH for guix-patches@gnu.org; Wed, 09 Nov 2022 03:04:36 -0500 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1osg4T-0005FD-Qt for guix-patches@gnu.org; Wed, 09 Nov 2022 03:04:32 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C8DC341162; Wed, 9 Nov 2022 09:04:26 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rlc8NoZAyvOE; Wed, 9 Nov 2022 09:04:25 +0100 (CET) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1667981064; bh=vPfMbYBGKOv5loKWSXS66XnihcKPOcBPrvTDfYacYNM=; h=From:To:Cc:Subject:Date:From; b=HQQwwqv+kc2818TrBBq8jrIM/nWMdae4TtaH8xlL4PVJFE9giLKo069NGeH/AFyMq 4PpqvBmvvnZg7w5tO87bzNLgRkt1zK9Pbo/g363l6ah1EVDP5ZcehfQpwcNKu/iwJN KV3KsEoq60XlwccCuxvBZpAUqQ6PoxCLIdLe4HZZ2HDULQBDP6lVl61XNQzayBYoRW 1t5Ksrb40MgLObpeRFjgGfObx7eJYpT9do0+0ieztMzUuH0XBw0aPUXOGLvOeohTPg DAP6jwEasWSZ0eRyrpOszm3A97+pnUpY0x2wt0WgvnYyIKpXscX6ZWT0Z1rypPChcu UqAi0Nk8eU7Hw== Date: Wed, 9 Nov 2022 08:04:20 +0000 Message-Id: <20221109080420.4799-1-paren@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/emacs-xyz.scm (emacs-magit)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 3 +++ .../emacs-magit-use-old-git-behaviour.patch | 24 +++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9e5c6bfe9d..5dc07aaf03 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1063,6 +1063,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ + %D%/packages/patches/emacs-magit-use-old-git-behaviour.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4bbebd3cd6..4b57eb8e05 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -117,6 +117,7 @@ ;;; Copyright © 2022 Jose G Perez Taveras ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -1001,6 +1002,8 @@ (define-public emacs-magit (uri (git-reference (url "https://github.com/magit/magit") (commit (string-append "v" version)))) + (patches + (search-patches "emacs-magit-use-old-git-behaviour.patch")) (file-name (git-file-name name version)) (sha256 (base32 "0cxyvp2aav27znc7mf6c83q5pddpdniaqkrxn1r8dbgr540qmnpn")))) diff --git a/gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch b/gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch new file mode 100644 index 0000000000..1f28d23cd2 --- /dev/null +++ b/gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch @@ -0,0 +1,24 @@ +This patch fixes two of Magit's tests when used with Git 2.38.1. Git commit +a1d4f67c12 (transport: make `protocol.file.allow` be "user" by default) had +broken them, so this cherry-pick of Magit 36059e0b sets it "protocol.file.allow" +back to "always". + +Author: Kyle Meyer +Added by: ( + +diff --git a/t/magit-tests.el b/t/magit-tests.el +index 523cc519..bc556d17 100644 +--- a/t/magit-tests.el ++++ b/t/magit-tests.el +@@ -24,7 +24,10 @@ + (declare (indent 0) (debug t)) + (let ((dir (make-symbol "dir"))) + `(let ((,dir (file-name-as-directory (make-temp-file "magit-" t))) +- (process-environment process-environment)) ++ (process-environment process-environment) ++ (magit-git-global-arguments ++ (nconc (list "-c" "protocol.file.allow=always") ++ magit-git-global-arguments))) + (push "GIT_AUTHOR_NAME=A U Thor" process-environment) + (push "GIT_AUTHOR_EMAIL=a.u.thor@example.com" process-environment) + (condition-case err \ No newline at end of file base-commit: 96ae718c516a289124a0b91ceeef78b20d187825 -- 2.38.1 From unknown Sun Jun 22 00:46:08 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#59145] [PATCH v2] gnu: emacs-magit: Fix tests. References: <20221109080420.4799-1-paren@disroot.org> In-Reply-To: <20221109080420.4799-1-paren@disroot.org> Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Nov 2022 08:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59145@debbugs.gnu.org Cc: "\(" Received: via spool by 59145-submit@debbugs.gnu.org id=B59145.166798114728161 (code B ref 59145); Wed, 09 Nov 2022 08:06:02 +0000 Received: (at 59145) by debbugs.gnu.org; 9 Nov 2022 08:05:47 +0000 Received: from localhost ([127.0.0.1]:38938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1osg5i-0007K8-SU for submit@debbugs.gnu.org; Wed, 09 Nov 2022 03:05:47 -0500 Received: from knopi.disroot.org ([178.21.23.139]:56736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1osg5T-0007Jm-Bj for 59145@debbugs.gnu.org; Wed, 09 Nov 2022 03:05:46 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 29D9A41139; Wed, 9 Nov 2022 09:05:30 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NrAZFEuuzUZm; Wed, 9 Nov 2022 09:05:28 +0100 (CET) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1667981128; bh=yphTvatouKDSxQxh9QpFUwecxO47o+yC9hrk8EDA1wE=; h=From:To:Cc:Subject:Date:From; b=LTi8BSbVbKfjrCHWU6kllj/S6YYNCzzXWc5ZHkQXxICsaWOiSeGkY4LuT9i/IJoKZ g58IkB695MdGD1TaX0srg3yX6nAveFE0D21OR0f9OsabfDHjfSxXswLQpOJC33RdOh ix9FRnqMdal1KlGS8yN4h7d5Rg+8qkw+V2jd//5h10BfOLJhkd05Ra6yhBOXqwMN5S JPY9NH9+T2+6uIXk3Djkn0jLHyu0v2Y4bosoDi6l7aKRg/iYloiEfFLpweFglw5V7W f7SLepTGgNdRocAVP3HnJLiKz233P1aPmy8MVKiP87SH8YhzLHvsjQcqL4NWXpmplb vZUWSVT1tZKbg== Date: Wed, 9 Nov 2022 08:05:24 +0000 Message-Id: <20221109080524.5089-1-paren@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.4 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/emacs-xyz.scm (emacs-magit)[source]: Use it. --- gnu/local. [...] Content analysis details: (1.4 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 FROM_ONE_CHAR Bogus FROM name 0.0 T_SPF_TEMPERROR SPF: test of record failed (temperror) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) * gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/emacs-xyz.scm (emacs-magit)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 3 +++ .../emacs-magit-use-old-git-behaviour.patch | 24 +++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9e5c6bfe9d..5dc07aaf03 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1063,6 +1063,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ + %D%/packages/patches/emacs-magit-use-old-git-behaviour.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4bbebd3cd6..4b57eb8e05 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -117,6 +117,7 @@ ;;; Copyright © 2022 Jose G Perez Taveras ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -1001,6 +1002,8 @@ (define-public emacs-magit (uri (git-reference (url "https://github.com/magit/magit") (commit (string-append "v" version)))) + (patches + (search-patches "emacs-magit-use-old-git-behaviour.patch")) (file-name (git-file-name name version)) (sha256 (base32 "0cxyvp2aav27znc7mf6c83q5pddpdniaqkrxn1r8dbgr540qmnpn")))) diff --git a/gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch b/gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch new file mode 100644 index 0000000000..669cf0486d --- /dev/null +++ b/gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch @@ -0,0 +1,24 @@ +This patch fixes two of Magit's tests when used with Git 2.38.1. Git commit +a1d4f67c12 (transport: make `protocol.file.allow` be "user" by default) had +broken them, so this cherry-pick of Magit 36059e0b sets it "protocol.file.allow" +back to "always". + +Author: Kyle Meyer +Added by: ( + +diff --git a/t/magit-tests.el b/t/magit-tests.el +index 523cc519..bc556d17 100644 +--- a/t/magit-tests.el ++++ b/t/magit-tests.el +@@ -24,7 +24,10 @@ + (declare (indent 0) (debug t)) + (let ((dir (make-symbol "dir"))) + `(let ((,dir (file-name-as-directory (make-temp-file "magit-" t))) +- (process-environment process-environment)) ++ (process-environment process-environment) ++ (magit-git-global-arguments ++ (nconc (list "-c" "protocol.file.allow=always") ++ magit-git-global-arguments))) + (push "GIT_AUTHOR_NAME=A U Thor" process-environment) + (push "GIT_AUTHOR_EMAIL=a.u.thor@example.com" process-environment) + (condition-case err base-commit: 96ae718c516a289124a0b91ceeef78b20d187825 -- 2.38.1 From unknown Sun Jun 22 00:46:08 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: "(" Subject: bug#59145: closed () Message-ID: References: <20221109080420.4799-1-paren@disroot.org> X-Gnu-PR-Message: they-closed 59145 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 59145@debbugs.gnu.org Date: Wed, 09 Nov 2022 19:51:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1668023462-1951-1" This is a multi-part message in MIME format... ------------=_1668023462-1951-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #59145: [PATCH] gnu: emacs-magit: Fix tests. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 59145@debbugs.gnu.org. --=20 59145: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D59145 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1668023462-1951-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 59145-done) by debbugs.gnu.org; 9 Nov 2022 19:50:34 +0000 Received: from localhost ([127.0.0.1]:40962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1osr5l-0000Um-Si for submit@debbugs.gnu.org; Wed, 09 Nov 2022 14:50:34 -0500 Received: from knopi.disroot.org ([178.21.23.139]:43192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1osr5j-0000Ud-JC for 59145-done@debbugs.gnu.org; Wed, 09 Nov 2022 14:50:32 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1414F411DE for <59145-done@debbugs.gnu.org>; Wed, 9 Nov 2022 20:50:30 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DBxJadbiAKrB for <59145-done@debbugs.gnu.org>; Wed, 9 Nov 2022 20:50:29 +0100 (CET) Mime-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1668023429; bh=yWk63SIi2ioAhwnivD6CguvgUuYPm1ZMPzUf2DZwOj0=; h=Date:Subject:From:To:From; b=U01jpZwTFwm7VpewlXPrO53xS5l9Z9Rnwq5kNAPJZRIMT8eQFCelNEl8hkK9/B6oo 37v2XZ87sbF5o6lvQja2oTxIoTaMEAb5qnjp/FENLvAckFvT7dFSM2FMnR2LT8jI5z K8RjGR3FTiMhNefboIO89NZwwlsnCUcgmbQxmE9YYQypP4UVLIwZ49r5Ah18JZp4pZ QSYyWQonGenn6wkS9eZSPDJcn8DD9azEj/ngIHNC2KMkLnjVOjQpslDP/ImPF7v0Sm myGzximR7pxeqfSY7O/MGB3nhYwlbNXglBcImPmjsj7Ohd5tC26jt7Bo8qrl6EOS0D tvRbKo63rtgvQ== Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Wed, 09 Nov 2022 19:50:28 +0000 Message-Id: Subject: From: "(" To: <59145-done@debbugs.gnu.org> X-Spam-Score: 3.3 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Looks like Andrew Tropin updated emacs-magit to that commit to fix it. I think it would have been better to use a cherry-picked patch, but oh well :) -- ( Content analysis details: (3.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 FROM_ONE_CHAR Bogus FROM name -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 BLANK_SUBJECT Subject is present but empty X-Debbugs-Envelope-To: 59145-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.3 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Looks like Andrew Tropin updated emacs-magit to that commit to fix it. I think it would have been better to use a cherry-picked patch, but oh well :) -- ( Content analysis details: (2.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 FROM_ONE_CHAR Bogus FROM name -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 BLANK_SUBJECT Subject is present but empty -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Looks like Andrew Tropin updated emacs-magit to that commit to fix it. I th= ink it would have been better to use a cherry-picked patch, but oh well :) -- ( ------------=_1668023462-1951-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 9 Nov 2022 08:04:40 +0000 Received: from localhost ([127.0.0.1]:38927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1osg4d-0007HU-Q3 for submit@debbugs.gnu.org; Wed, 09 Nov 2022 03:04:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:44908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1osg4c-0007HN-2s for submit@debbugs.gnu.org; Wed, 09 Nov 2022 03:04:38 -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 1osg4X-0005OZ-OH for guix-patches@gnu.org; Wed, 09 Nov 2022 03:04:36 -0500 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1osg4T-0005FD-Qt for guix-patches@gnu.org; Wed, 09 Nov 2022 03:04:32 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C8DC341162; Wed, 9 Nov 2022 09:04:26 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rlc8NoZAyvOE; Wed, 9 Nov 2022 09:04:25 +0100 (CET) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1667981064; bh=vPfMbYBGKOv5loKWSXS66XnihcKPOcBPrvTDfYacYNM=; h=From:To:Cc:Subject:Date:From; b=HQQwwqv+kc2818TrBBq8jrIM/nWMdae4TtaH8xlL4PVJFE9giLKo069NGeH/AFyMq 4PpqvBmvvnZg7w5tO87bzNLgRkt1zK9Pbo/g363l6ah1EVDP5ZcehfQpwcNKu/iwJN KV3KsEoq60XlwccCuxvBZpAUqQ6PoxCLIdLe4HZZ2HDULQBDP6lVl61XNQzayBYoRW 1t5Ksrb40MgLObpeRFjgGfObx7eJYpT9do0+0ieztMzUuH0XBw0aPUXOGLvOeohTPg DAP6jwEasWSZ0eRyrpOszm3A97+pnUpY0x2wt0WgvnYyIKpXscX6ZWT0Z1rypPChcu UqAi0Nk8eU7Hw== To: guix-patches@gnu.org Subject: [PATCH] gnu: emacs-magit: Fix tests. Date: Wed, 9 Nov 2022 08:04:20 +0000 Message-Id: <20221109080420.4799-1-paren@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit Cc: "\(" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/emacs-xyz.scm (emacs-magit)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 3 +++ .../emacs-magit-use-old-git-behaviour.patch | 24 +++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9e5c6bfe9d..5dc07aaf03 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1063,6 +1063,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ + %D%/packages/patches/emacs-magit-use-old-git-behaviour.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4bbebd3cd6..4b57eb8e05 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -117,6 +117,7 @@ ;;; Copyright © 2022 Jose G Perez Taveras ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -1001,6 +1002,8 @@ (define-public emacs-magit (uri (git-reference (url "https://github.com/magit/magit") (commit (string-append "v" version)))) + (patches + (search-patches "emacs-magit-use-old-git-behaviour.patch")) (file-name (git-file-name name version)) (sha256 (base32 "0cxyvp2aav27znc7mf6c83q5pddpdniaqkrxn1r8dbgr540qmnpn")))) diff --git a/gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch b/gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch new file mode 100644 index 0000000000..1f28d23cd2 --- /dev/null +++ b/gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch @@ -0,0 +1,24 @@ +This patch fixes two of Magit's tests when used with Git 2.38.1. Git commit +a1d4f67c12 (transport: make `protocol.file.allow` be "user" by default) had +broken them, so this cherry-pick of Magit 36059e0b sets it "protocol.file.allow" +back to "always". + +Author: Kyle Meyer +Added by: ( + +diff --git a/t/magit-tests.el b/t/magit-tests.el +index 523cc519..bc556d17 100644 +--- a/t/magit-tests.el ++++ b/t/magit-tests.el +@@ -24,7 +24,10 @@ + (declare (indent 0) (debug t)) + (let ((dir (make-symbol "dir"))) + `(let ((,dir (file-name-as-directory (make-temp-file "magit-" t))) +- (process-environment process-environment)) ++ (process-environment process-environment) ++ (magit-git-global-arguments ++ (nconc (list "-c" "protocol.file.allow=always") ++ magit-git-global-arguments))) + (push "GIT_AUTHOR_NAME=A U Thor" process-environment) + (push "GIT_AUTHOR_EMAIL=a.u.thor@example.com" process-environment) + (condition-case err \ No newline at end of file base-commit: 96ae718c516a289124a0b91ceeef78b20d187825 -- 2.38.1 ------------=_1668023462-1951-1--