* [PATCH] gnu: magit: Fix interactive rebase.
@ 2016-07-26 20:57 Alex Griffin
2016-07-27 8:21 ` Alex Kost
0 siblings, 1 reply; 3+ messages in thread
From: Alex Griffin @ 2016-07-26 20:57 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 122 bytes --]
This patch fixes magit's interactive rebase function, which calls perl
and fails if perl is not in PATH.
--
Alex Griffin
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-magit-Fix-interactive-rebase.patch --]
[-- Type: text/x-patch; name="0001-gnu-magit-Fix-interactive-rebase.patch", Size: 1935 bytes --]
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] gnu: magit: Fix interactive rebase.
2016-07-26 20:57 [PATCH] gnu: magit: Fix interactive rebase Alex Griffin
@ 2016-07-27 8:21 ` Alex Kost
2016-07-27 21:26 ` Alex Griffin
0 siblings, 1 reply; 3+ messages in thread
From: Alex Kost @ 2016-07-27 8:21 UTC (permalink / raw)
To: Alex Griffin; +Cc: guix-devel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gnu: magit: Fix interactive rebase.
2016-07-27 8:21 ` Alex Kost
@ 2016-07-27 21:26 ` Alex Griffin
0 siblings, 0 replies; 3+ messages in thread
From: Alex Griffin @ 2016-07-27 21:26 UTC (permalink / raw)
To: Alex Kost; +Cc: guix-devel
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.
--
Alex Griffin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-27 21:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-26 20:57 [PATCH] gnu: magit: Fix interactive rebase Alex Griffin
2016-07-27 8:21 ` Alex Kost
2016-07-27 21:26 ` Alex Griffin
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).