diff mbox

gnu: magit: Fix interactive rebase.

Message ID 1469566632.3642255.677600593.59DB7F13@webmail.messagingengine.com
State New
Headers show

Commit Message

Alex Griffin July 26, 2016, 8:57 p.m. UTC
This patch fixes magit's interactive rebase function, which calls perl
and fails if perl is not in PATH.

Comments

Alex Kost July 27, 2016, 8:21 a.m. UTC | #1
Alex Griffin (2016-07-26 23:57 +0300) wrote:

> This patch fixes magit's interactive rebase function, which calls perl
> and fails if perl is not in PATH.

Indeed!  I've never noticed it as I always used "r i", and not the other
rebase commands.  For the records: this patch fixes
'magit-rebase-edit-commit' and 'magit-rebase-reword-commit' commands
(which are bound to "r m" and "r w" by default).

> From 1f73f2635225bfcf942194ffe8c02a07e4705d34 Mon Sep 17 00:00:00 2001
> From: Alex Griffin <a@ajgrf.com>
> Date: Tue, 26 Jul 2016 13:29:51 -0500
> Subject: [PATCH] gnu: magit: Fix interactive rebase.
>
> * gnu/packages/emacs.scm (magit): Fix interactive rebase.

Since this fix is not really for the "interactive rebase" itself (I mean
what is bound to "r i"), but for the other rebase commands, I changed
the commit message and applied the patch as 46bd45152¹, thanks!

¹ http://git.savannah.gnu.org/cgit/guix.git/commit/?id=46bd451520d7a318e8b52a4a500d146403b8dcb8
Alex Griffin July 27, 2016, 9:26 p.m. UTC | #2
On Wed, Jul 27, 2016, at 03:21 AM, Alex Kost wrote:
> Since this fix is not really for the "interactive rebase" itself (I mean
> what is bound to "r i"), but for the other rebase commands, I changed
> the commit message and applied the patch as 46bd45152¹, thanks!

Ah, somehow I thought it affected all of the rebase commands. I should
have known someone would have caught it if it did.
diff mbox

Patch

From 1f73f2635225bfcf942194ffe8c02a07e4705d34 Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Tue, 26 Jul 2016 13:29:51 -0500
Subject: [PATCH] gnu: magit: Fix interactive rebase.

* gnu/packages/emacs.scm (magit): Fix interactive rebase.
---
 gnu/packages/emacs.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 8dd728b..f6e1234 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -13,6 +13,7 @@ 
 ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
 ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -454,7 +455,9 @@  on stdout instead of using a socket as the Emacsclient does.")
     (build-system gnu-build-system)
     (native-inputs `(("texinfo" ,texinfo)
                      ("emacs" ,emacs-minimal)))
-    (inputs `(("git" ,git)))
+    (inputs
+     `(("git" ,git)
+       ("perl" ,perl)))
     (propagated-inputs
      `(("dash" ,emacs-dash)
        ("with-editor" ,emacs-with-editor)))
@@ -487,9 +490,12 @@  on stdout instead of using a socket as the Emacsclient does.")
          (add-before
           'build 'patch-exec-paths
           (lambda* (#:key inputs #:allow-other-keys)
-            (let ((git (assoc-ref inputs "git")))
+            (let ((git (assoc-ref inputs "git"))
+                  (perl (assoc-ref inputs "perl")))
               (emacs-substitute-variables "lisp/magit-git.el"
                 ("magit-git-executable" (string-append git "/bin/git")))
+              (substitute* "lisp/magit-sequence.el"
+                (("perl") (string-append perl "/bin/perl")))
               #t))))))
     (home-page "http://magit.github.io/")
     (synopsis "Emacs interface for the Git version control system")
-- 
2.9.2