unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 1f28d23cd223379df14a91ad500c127794b7d1dc 1034 bytes (raw)
name: gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
 
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@kyleam.com>
Added by: ( <paren@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@example.com" process-environment)
        (condition-case err

debug log:

solving 1f28d23cd2 ...
found 1f28d23cd2 in https://yhetil.org/guix-patches/20221109080420.4799-1-paren@disroot.org/

applying [1/1] https://yhetil.org/guix-patches/20221109080420.4799-1-paren@disroot.org/
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

Checking patch gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch...
Applied patch gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch cleanly.

index at:
100644 1f28d23cd223379df14a91ad500c127794b7d1dc	gnu/packages/patches/emacs-magit-use-old-git-behaviour.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).