From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#21559: 25.0.50; auto-revert-mode breaks git rebase Date: Thu, 22 Feb 2018 13:45:16 +0200 Message-ID: <26192705-b938-8260-52a4-76a9f4d6ee6f@yandex.ru> References: <5d7808ef-d61f-534d-53b3-bc1227b4c3b1@yandex.ru> <87fu5w2jnh.fsf@gmx.de> <40817863-9c34-9745-6fff-4357d623de20@yandex.ru> <87po4z512z.fsf@gmx.de> <87efldfesf.fsf@gmx.de> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1519299858 11058 195.159.176.226 (22 Feb 2018 11:44:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 22 Feb 2018 11:44:18 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:59.0) Gecko/20100101 Thunderbird/59.0 Cc: 21559-done@debbugs.gnu.org To: Michael Albinus , Alexei Khlebnikov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Feb 22 12:44:14 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eopIK-0002KJ-Ra for geb-bug-gnu-emacs@m.gmane.org; Thu, 22 Feb 2018 12:44:12 +0100 Original-Received: from localhost ([::1]:37523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eopKN-0000ES-3m for geb-bug-gnu-emacs@m.gmane.org; Thu, 22 Feb 2018 06:46:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eopK9-0000C5-Qs for bug-gnu-emacs@gnu.org; Thu, 22 Feb 2018 06:46:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eopK6-0005PS-Oh for bug-gnu-emacs@gnu.org; Thu, 22 Feb 2018 06:46:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:47472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eopK6-0005PH-KX for bug-gnu-emacs@gnu.org; Thu, 22 Feb 2018 06:46:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eopK6-00024T-Dz for bug-gnu-emacs@gnu.org; Thu, 22 Feb 2018 06:46:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 22 Feb 2018 11:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 21559 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 21559-done@debbugs.gnu.org id=D21559.15192999327921 (code D ref 21559); Thu, 22 Feb 2018 11:46:02 +0000 Original-Received: (at 21559-done) by debbugs.gnu.org; 22 Feb 2018 11:45:32 +0000 Original-Received: from localhost ([127.0.0.1]:55369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eopJc-00023h-0G for submit@debbugs.gnu.org; Thu, 22 Feb 2018 06:45:32 -0500 Original-Received: from mail-wm0-f43.google.com ([74.125.82.43]:34074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eopJZ-00023T-Ob for 21559-done@debbugs.gnu.org; Thu, 22 Feb 2018 06:45:31 -0500 Original-Received: by mail-wm0-f43.google.com with SMTP id a20so2069058wmd.1 for <21559-done@debbugs.gnu.org>; Thu, 22 Feb 2018 03:45:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=beFVL24b7zcESmgDy4+y+Cj5yDD4vM06u+lNi+UeNwg=; b=laBvTjQ0Qz13F9RqIVMKrbEPEcfrhjlDHfLgo733bJcDY/03gKxzqWQWErt6NTIqaB 2cHOun2fQBOoYr9ON/u/DXNZNQ82gRJtt+87ds2gerlvPn1wuZB7d2vUEMCzyjXWJVLD FR3rqabkIElmuckBtebASC0xvgISFVqMpRuXS73dQS6/j15F10LoFExuWtnzWLcSnbe+ fONrDzG0TMY54GlygWbKZETLDh7cFsV/sn2HXiazZvPhTpqCxpLgp74FWUHGjK3T5APE 2yPO6PKIwNY/126PBXTaAJ3q4DZqM8tQzuNJFAfMVN08AHM4E+plTcZyBCKuj9qpn93J FU4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=beFVL24b7zcESmgDy4+y+Cj5yDD4vM06u+lNi+UeNwg=; b=eE+rZ7ur0nM6VuhGh/f4wiMd+Vc2NVrXUQwzn/CeyAqewWs6Rh6kH0KAKnw8bN/nJO 9vwdsBsy10RbUiuS90Gu05trEIh7FEN1Q/SuCoStefpFGPS7b6pjvpCkfQEF3RFz8WeR tIFZwmFrwAgD7BgonzF7zSw8DRQA591QfOg7C4M54T1ZLLPljTGlSSEz2fCm1RiIuAuO fstrugmzc2E+SDir6ZmgjUgdPT+6cm7BirrZUQ45hWWlku7jUs3ttcVXT9YeXl9mSW5l bX0X3K3w+/Vfwxp8RLFlGkcyiOyG/eHM0QmJ9Yj7fspwZW8inRLWGptdxIN18ZKbYhT/ sa5Q== X-Gm-Message-State: APf1xPAAY3A06VqdTmyfTwTsiC5Q5qs/rsLT90xydG+C4fWqqdqz56aY ouL/VveX6XGWpBvApoRi/4gqbUlw X-Google-Smtp-Source: AH8x225Uhc88CvWyp4Nge6yovw5zpOcYna/U46F9u5XIOu+O77MKa0i4uuuRRI1k4J4XXB4hDGMVpg== X-Received: by 10.28.229.213 with SMTP id c204mr4511249wmh.1.1519299921792; Thu, 22 Feb 2018 03:45:21 -0800 (PST) Original-Received: from [192.168.1.3] ([185.105.174.193]) by smtp.googlemail.com with ESMTPSA id y6sm250987wmy.14.2018.02.22.03.45.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 03:45:18 -0800 (PST) In-Reply-To: <87efldfesf.fsf@gmx.de> Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:143600 Archived-At: On 2/22/18 1:24 PM, Michael Albinus wrote: >> Here is version 4 of the patch. >> >> "revert-buffer-in-progress-p" flag is set in "auto-revert-handler", >> according to Michael's idea and then checked in "vc-git-command", >> according to Dmitry's idea. > > LGTM, I've pushed this to master. Great, thank you both.