GNU bug report logs - #59145
[PATCH] gnu: emacs-magit: Fix tests.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: "(" <paren <at> disroot.org>
Subject: bug#59145: closed ()
Date: Wed, 09 Nov 2022 19:51:02 +0000

[Message part 1 (text/plain, inline)]

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 <at> debbugs.gnu.org.

-- 
59145: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59145
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: "(" <paren <at> disroot.org>
To: <59145-done <at> debbugs.gnu.org>
Date: Wed, 09 Nov 2022 19:50:28 +0000

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 :)

    -- (

[Message part 3 (message/rfc822, inline)]

From: "(" <paren <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: "\(" <paren <at> disroot.org>
Subject: [PATCH] gnu: emacs-magit: Fix tests.
Date: Wed,  9 Nov 2022 08:04:20 +0000

* 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]<patches>: 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 <josegpt27 <at> gmail.com>
 ;;; Copyright © 2022 Hilton Chain <hako <at> ultrarare.space>
 ;;; Copyright © 2022 Nicolas Graves <ngraves <at> ngraves.fr>
+;;; Copyright © 2022 ( <paren <at> disroot.org>
 ;;;
 ;;; 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 <kyle <at> kyleam.com>
+Added by: ( <paren <at> disroot.org>
+
+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 <at> example.com" process-environment)
+        (condition-case err
\ No newline at end of file

base-commit: 96ae718c516a289124a0b91ceeef78b20d187825
-- 
2.38.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.