From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Marcin Borkowski Newsgroups: gmane.emacs.help Subject: Re: A problem with Magit Date: Sun, 26 Jul 2015 21:21:36 +0200 Message-ID: <87k2tmg1xb.fsf@mbork.pl> References: <87k2tn2q8n.fsf@mbork.pl> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1437938524 2950 80.91.229.3 (26 Jul 2015 19:22:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 26 Jul 2015 19:22:04 +0000 (UTC) To: Help Gnu Emacs mailing list Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Sun Jul 26 21:22:03 2015 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZJRUn-0007UI-4p for geh-help-gnu-emacs@m.gmane.org; Sun, 26 Jul 2015 21:22:01 +0200 Original-Received: from localhost ([::1]:50782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJRUm-0006Tk-AL for geh-help-gnu-emacs@m.gmane.org; Sun, 26 Jul 2015 15:22:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJRUY-0006Rb-LE for help-gnu-emacs@gnu.org; Sun, 26 Jul 2015 15:21:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZJRUU-0000l1-RF for help-gnu-emacs@gnu.org; Sun, 26 Jul 2015 15:21:46 -0400 Original-Received: from mail.mojserwer.eu ([2a01:5e00:2:52::8]:34840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZJRUU-0000kd-KX for help-gnu-emacs@gnu.org; Sun, 26 Jul 2015 15:21:42 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by mail.mojserwer.eu (Postfix) with ESMTP id 097D88F2002 for ; Sun, 26 Jul 2015 21:21:42 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.mojserwer.eu Original-Received: from mail.mojserwer.eu ([127.0.0.1]) by localhost (mail.mojserwer.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KdZFQavhIcR1 for ; Sun, 26 Jul 2015 21:21:38 +0200 (CEST) Original-Received: from localhost (unknown [109.232.24.146]) by mail.mojserwer.eu (Postfix) with ESMTPSA id 7017A6F2003 for ; Sun, 26 Jul 2015 21:21:37 +0200 (CEST) In-reply-to: <87k2tn2q8n.fsf@mbork.pl> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:5e00:2:52::8 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:106014 Archived-At: Hi there, I found the culprit: it was a good ol'editing conflict. The two commits I wanted to swap involved edits too close to each other. Best, mb On 2015-07-26, at 12:00, Marcin Borkowski wrote: > Hi all, > > I tried interactive rebase in Magit today, and ran into this (in the > magit-process buffer): > > ,---- > | Waiting for Emacs... > | *ERROR*: Canceled by user > | Could not execute editor > `---- > > All I did was to swap to commits, so theoretically this should run > smoothly. > > The only Magit-relevant setting in my init.el is (setq > magit-revert-buffers nil). > > However, there is one (potential) problem: when I start Magit, I see > this: > > ,---- > | Error (magit): Magit requires Git >= 1.9.4, you are using 1.9.1. > `---- > > I'm not sure whether this is relevant, but I include it here just in > case. (Of course, I'm going to upgrade my Ubuntu ASAP.) > > Where should I look for solution? > > Best, -- Marcin Borkowski http://octd.wmi.amu.edu.pl/en/Marcin_Borkowski Faculty of Mathematics and Computer Science Adam Mickiewicz University