From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Alexei Khlebnikov Newsgroups: gmane.emacs.bugs Subject: bug#21559: PATCH review needed: lisp/vc/vc-git.el (vc-git-state, vc-git-conflicted-files) Date: Mon, 19 Feb 2018 19:39:53 +0100 Message-ID: References: <83bmgl9evw.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="94eb2c1b656c4ed4060565950633" X-Trace: blaine.gmane.org 1519065626 11347 195.159.176.226 (19 Feb 2018 18:40:26 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 19 Feb 2018 18:40:26 +0000 (UTC) Cc: Michael Albinus , Dmitry Gutov To: 21559@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Feb 19 19:40:21 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 1enqM2-000194-F4 for geb-bug-gnu-emacs@m.gmane.org; Mon, 19 Feb 2018 19:39:58 +0100 Original-Received: from localhost ([::1]:51833 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1enqO3-00045E-6a for geb-bug-gnu-emacs@m.gmane.org; Mon, 19 Feb 2018 13:42:03 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1enqN8-0003d7-1E for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2018 13:41:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1enqN4-0007mE-1d for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2018 13:41:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:43720) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1enqN3-0007m1-QZ for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2018 13:41:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1enqN3-00073Z-Kj for bug-gnu-emacs@gnu.org; Mon, 19 Feb 2018 13:41:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Alexei Khlebnikov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 19 Feb 2018 18:41:01 +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-submit@debbugs.gnu.org id=B21559.151906562227066 (code B ref 21559); Mon, 19 Feb 2018 18:41:01 +0000 Original-Received: (at 21559) by debbugs.gnu.org; 19 Feb 2018 18:40:22 +0000 Original-Received: from localhost ([127.0.0.1]:51617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1enqMP-00072T-IP for submit@debbugs.gnu.org; Mon, 19 Feb 2018 13:40:22 -0500 Original-Received: from mail-wr0-f169.google.com ([209.85.128.169]:42164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1enqMO-00072G-0a for 21559@debbugs.gnu.org; Mon, 19 Feb 2018 13:40:20 -0500 Original-Received: by mail-wr0-f169.google.com with SMTP id k9so10643821wre.9 for <21559@debbugs.gnu.org>; Mon, 19 Feb 2018 10:40:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=ztdWV9hp5WlTMsHWXBEX/4zHQpcXqpptCKcqf5bFbjg=; b=hjY9uUEbl1etQO8tSFShGH4jILRH8y0fO73HT+TnUPBNv5yJoPWIqByfq0GsAj1g6A hf6C7yC2hprlJEoGGgxmJwuhPGwYY4PcQTi9RkfTvcBMqak2gkT3f38pNuB2NilDsAyd CCnvg96arAHztz6OoIc6V8CHerT+1M8yel/vyOyVEfRuCY8qC85CGmgwpsFhoM7fUMY7 CiRpyT5/mZauwqaBdJYaF2P5I2voFuzxnsJYCQajFNUPNTABlIkGRVhlXJSHceMxILLn 6+u2ncL5EQf0Nf6XBPF0sBrFwg21ahigBhXKqaAIj9YJqfOK0Jdq6yUg8oBtlsyvWocG Jdqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=ztdWV9hp5WlTMsHWXBEX/4zHQpcXqpptCKcqf5bFbjg=; b=sDxYp9YJD/10hKjVVOB+08JCQGFT6IEhrBySR6KhGG0uu5yaZgAKlFsUFx4rg7j8uS xxcYbW6bKta1P3oOo/hemQThYYXoIRPvVFuBFHDXRRzWazsR+7ROTilEVanIqbUvVX8p ExRoKS448fe2Mv2vNypTe2ShRMllVFxnhIj1ZY6Y/tL2pRlsWEP2wv6/idnTSzX1qJQP Y7dwRsoZIIj3LN+PtODXiW4dn8LZfq8pyhC5l4JWJojM3ooiiXG2zqmBKmq6/QJ0XfS+ nF9YIblaslENK6+yK5nYIjaQ4jZERWijhdET42eAYZ5WyyJv7h58Dnfiwqdc7oohMvwY f4OA== X-Gm-Message-State: APf1xPB45lUbwAY9Eq+9dUm5cK0HDpPUjZCMbsfNhQQZMwylhHF79nUF h5KdTPI5DcaFOQM5jo6qsNzTmcYAGKG6yqyEHoZDAA== X-Google-Smtp-Source: AH8x227xwl/KcIyNhkDAv59vBpNZxekvSmdjI1ZR5LLvoeEphszSvftRIg1MTnkY51ji8xpwoZxa8bD9/NOPsxtraRM= X-Received: by 10.223.151.129 with SMTP id s1mr14468682wrb.206.1519065613907; Mon, 19 Feb 2018 10:40:13 -0800 (PST) Original-Received: by 10.28.229.138 with HTTP; Mon, 19 Feb 2018 10:39:53 -0800 (PST) In-Reply-To: <83bmgl9evw.fsf@gnu.org> 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:143472 Archived-At: --94eb2c1b656c4ed4060565950633 Content-Type: text/plain; charset="UTF-8" Eli, Michael, thanks for the review. > A better approach would be to prepend "GIT_OPTIONAL_LOCKS=0" in `process-environment'. Thanks for the suggestion, I am attaching version 2 of the patch which implements this suggestion. > > Adding to the discussion: > > * Dmitry Gutov, because he is the maintainer for lisp/vc/* . > > * Eli Zaretskii and Michael Albinus, because they participated in the discussion on this bug before. > > Thanks, but there's no need to add me: I read all the messages sent to > the bug list. OK, I've removed you from the addressees. I'm not sure if I should do the same for others, so I left Dmitry and Michael in CC. --94eb2c1b656c4ed4060565950633 Content-Type: text/x-patch; charset="US-ASCII"; name="v2-0001-Fix-for-25.0.50-auto-revert-mode-breaks-git-rebas.patch" Content-Disposition: attachment; filename="v2-0001-Fix-for-25.0.50-auto-revert-mode-breaks-git-rebas.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jdujwg8b0 RnJvbSA1MjY1ZDA0ZjkwOGNkY2FiMTJiMjQ0MDIyMjFiMThkODNmYWIxZjQzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4ZWkgS2hsZWJuaWtvdiA8YWxleGVpLmtobGVibmlrb3ZA Z21haWwuY29tPgpEYXRlOiBNb24sIDE5IEZlYiAyMDE4IDE5OjA3OjU4ICswMTAwClN1YmplY3Q6 IFtQQVRDSCB2Ml0gRml4IGZvcjogIjI1LjAuNTA7IGF1dG8tcmV2ZXJ0LW1vZGUgYnJlYWtzIGdp dCByZWJhc2UiCiAoQnVnIzIxNTU5KQoKKiBsaXNwL3ZjL3ZjLWdpdC5lbCAodmMtZ2l0LXN0YXRl LCB2Yy1naXQtY29uZmxpY3RlZC1maWxlcyk6CiAgUHJlcGVuZCAiR0lUX09QVElPTkFMX0xPQ0tT PTAiIHRvIHByb2Nlc3MtZW52aXJvbm1lbnQKICB3aGVuIGRvaW5nICJnaXQgc3RhdHVzIi4KLS0t CiBsaXNwL3ZjL3ZjLWdpdC5lbCB8IDEyICsrKysrKysrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDkg aW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL3ZjL3ZjLWdp dC5lbCBiL2xpc3AvdmMvdmMtZ2l0LmVsCmluZGV4IDQ3MTcyZGQ1MmYuLjM1Y2I3ZGVmY2EgMTAw NjQ0Ci0tLSBhL2xpc3AvdmMvdmMtZ2l0LmVsCisrKyBiL2xpc3AvdmMvdmMtZ2l0LmVsCkBAIC0y OTEsMTQgKzI5MSwxNyBAQCB2Yy1naXQtc3RhdGUKICAgOzsgY29ycmVzcG9uZGluZyB1cHN0cmVh bSBicmFuY2gsIGFuZCB0aGUgZmlsZSB3YXMgbW9kaWZpZWQKICAgOzsgdXBzdHJlYW0uICBXZSdk IG5lZWQgdG8gY2hlY2sgYWdhaW5zdCB0aGUgdXBzdHJlYW0gdHJhY2tpbmcKICAgOzsgYnJhbmNo IGZvciB0aGF0IChhbiBleHRyYSBwcm9jZXNzIGNhbGwgb3IgdHdvKS4KLSAgKGxldCogKChhcmdz CisgIChsZXQqICg7OyBBdm9pZCByZXBvc2l0b3J5IGxvY2tpbmcgZHVyaW5nICJnaXQgc3RhdHVz IiAoYnVnIzIxNTU5KS4KKyAgICAgICAgIChwcm9jZXNzLWVudmlyb25tZW50CisgICAgICAgICAg KGNvbnMgIkdJVF9PUFRJT05BTF9MT0NLUz0wIiBwcm9jZXNzLWVudmlyb25tZW50KSkKKyAgICAg ICAgIChhcmdzCiAgICAgICAgICAgYCgic3RhdHVzIiAiLS1wb3JjZWxhaW4iICIteiIKICAgICAg ICAgICAgIDs7IEp1c3QgdG8gYmUgZXhwbGljaXQsIGl0J3MgdGhlIGRlZmF1bHQgYW55d2F5Lgog ICAgICAgICAgICAgIi0tdW50cmFja2VkLWZpbGVzIgogICAgICAgICAgICAgLEAod2hlbiAodmVy c2lvbjw9ICIxLjcuNi4zIiAodmMtZ2l0LS1wcm9ncmFtLXZlcnNpb24pKQogICAgICAgICAgICAg ICAgICcoIi0taWdub3JlZCIpKQogICAgICAgICAgICAgIi0tIikpCi0gICAgICAgIChzdGF0dXMg KGFwcGx5ICMndmMtZ2l0LS1ydW4tY29tbWFuZC1zdHJpbmcgZmlsZSBhcmdzKSkpCisgICAgICAg ICAoc3RhdHVzIChhcHBseSAjJ3ZjLWdpdC0tcnVuLWNvbW1hbmQtc3RyaW5nIGZpbGUgYXJncykp KQogICAgIDs7IEFsdGVybmF0aXZlbHksIHRoZSBgaWdub3JlZCcgc3RhdGUgY291bGQgYmUgZGV0 ZWN0ZWQgd2l0aCAnZ2l0CiAgICAgOzsgbHMtZmlsZXMgLWkgLW8gLS1leGNsdWRlLXN0YW5kYXJk JywgYnV0IHRoYXQncyBhbiBleHRyYSBwcm9jZXNzCiAgICAgOzsgY2FsbCwgYW5kIHRoZSBgaWdu b3JlZCcgc3RhdGUgaXMgcmFyZWx5IG5lZWRlZC4KQEAgLTkzOSw3ICs5NDIsMTAgQEAgdmMtZ2l0 LW1lcmdlLWJyYW5jaAogCiAoZGVmdW4gdmMtZ2l0LWNvbmZsaWN0ZWQtZmlsZXMgKGRpcmVjdG9y eSkKICAgIlJldHVybiB0aGUgbGlzdCBvZiBmaWxlcyB3aXRoIGNvbmZsaWN0cyBpbiBESVJFQ1RP UlkuIgotICAobGV0KiAoKHN0YXR1cworICAobGV0KiAoOzsgQXZvaWQgcmVwb3NpdG9yeSBsb2Nr aW5nIGR1cmluZyAiZ2l0IHN0YXR1cyIgKGJ1ZyMyMTU1OSkuCisgICAgICAgICAocHJvY2Vzcy1l bnZpcm9ubWVudAorICAgICAgICAgIChjb25zICJHSVRfT1BUSU9OQUxfTE9DS1M9MCIgcHJvY2Vz cy1lbnZpcm9ubWVudCkpCisgICAgICAgICAoc3RhdHVzCiAgICAgICAgICAgKHZjLWdpdC0tcnVu LWNvbW1hbmQtc3RyaW5nIGRpcmVjdG9yeSAic3RhdHVzIiAiLS1wb3JjZWxhaW4iICItLSIpKQog ICAgICAgICAgKGxpbmVzICh3aGVuIHN0YXR1cyAoc3BsaXQtc3RyaW5nIHN0YXR1cyAiXG4iICdv bWl0LW51bGxzKSkpCiAgICAgICAgICBmaWxlcykKLS0gCjIuMTUuMQoK --94eb2c1b656c4ed4060565950633--