From patchwork Wed Nov 9 08:05:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 44407 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6BBEE27BBEB; Wed, 9 Nov 2022 08:06:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9BCF527BBE9 for ; Wed, 9 Nov 2022 08:06:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1osg69-0005pF-My; Wed, 09 Nov 2022 03:06:14 -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 1osg5z-0005kk-JX for guix-patches@gnu.org; Wed, 09 Nov 2022 03:06:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1osg5y-0008DE-Fd for guix-patches@gnu.org; Wed, 09 Nov 2022 03:06:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1osg5y-0007Kh-AW for guix-patches@gnu.org; Wed, 09 Nov 2022 03:06:02 -0500 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) 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 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: , Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 base-commit: 96ae718c516a289124a0b91ceeef78b20d187825 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