From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 14 07:16:37 2016 Received: (at submit) by debbugs.gnu.org; 14 Jun 2016 11:16:37 +0000 Received: from localhost ([127.0.0.1]:39641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCmKi-00027V-PN for submit@debbugs.gnu.org; Tue, 14 Jun 2016 07:16:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCmKg-00027J-Nk for submit@debbugs.gnu.org; Tue, 14 Jun 2016 07:16:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCmKa-0006kB-Ff for submit@debbugs.gnu.org; Tue, 14 Jun 2016 07:16:29 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:51494) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCmKa-0006k7-CQ for submit@debbugs.gnu.org; Tue, 14 Jun 2016 07:16:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCmKZ-0003nb-50 for bug-gnu-emacs@gnu.org; Tue, 14 Jun 2016 07:16:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCmKU-0006jt-3t for bug-gnu-emacs@gnu.org; Tue, 14 Jun 2016 07:16:27 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:57622) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCmKT-0006jm-PN for bug-gnu-emacs@gnu.org; Tue, 14 Jun 2016 07:16:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID:Date: Subject:To:From; bh=scZvdAQw1Ary1qaCQOm1yr4PPkFGN8nkXENy9D9TxaQ=; b=KailEcCD7 X84TyFsm4VGvfoHO50kqu3X6l0F7smv0FJ1zPLbJzEakZcYw74WLA7e7tmtWYTn8p0JXZsTpLln/d EGs3rxYvr86vSndclB1x9yvO05whJt9gUC6RNDzqTIebljYtuVU/JUAcxc5dWzWZkSGJ5azu7fh1Q EpWjjVtZYDDhn3Gm65nCUU9hQMCkbQXddD93Xy4togpO6RNl0wFlhBavvFqklT4i5UdFeSy7KcKZP MJHXwbnhwToG/EMhsc+IpQmu91967w2BaqTdJ30RUUbq948sKlGEXryL9tIeWIAtLvvNvVEcOXiHf NdlXS9RTR5hZ0sGoczBdRGpSA==; Received: from janus-nat-128-240-225-60.ncl.ac.uk ([128.240.225.60]:33357 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bCmKR-004NZZ-N2 for bug-gnu-emacs@gnu.org; Tue, 14 Jun 2016 12:16:19 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: bug-gnu-emacs@gnu.org Subject: 25.0.95; Mode Line breakage in vc-git Date: Tue, 14 Jun 2016 12:16:19 +0100 Message-ID: <87a8ioyq9o.fsf@russet.org.uk> MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) I am seeing a recurrent problem with vc, on Emacs-25. I am running emacs via cask, which is running a test set. The error looks like this: vc-call-backend(Git mode-line-string "/home/phillord/emacs/lentic/de vc-mode-line("/home/phillord/emacs/lentic/dev-resources/chunk-commen vc-refresh-state() run-hooks(find-file-hook) after-find-file(nil t) find-file-noselect-1(# "~/emacs/lentic/dev find-file-noselect("/home/phillord/emacs/lentic/dev-resources/chunk- (setq this (find-file-noselect filename)) (set-buffer (setq this (find-file-noselect filename))) (save-current-buffer (set-buffer (setq this (find-file-noselect file Initially, I only saw it when using Emacs in my git commit-hook -- the same "make" command in the shell caused no problems. However, it is freely reproducible by launching with "GIT_DIR=.git make -k" which suggests this is why it is failing during the git commit. I've tried "instrumenting" (i.e. putting lots of logging) into vc. The immediate cause of the error appears to be in vc-git--call when it runs the git command "symbolic-ref". vc-git--call: about to apply: (git nil (t nil) nil symbolic-ref (HEAD)) vc-git--call: return 128 If GIT_DIR is not set this has a zero return value. I haven't worked out yet, how to find what the error is (128 is "any other error"). From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 14 12:29:57 2016 Received: (at 23769) by debbugs.gnu.org; 14 Jun 2016 16:29:57 +0000 Received: from localhost ([127.0.0.1]:40797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCrDx-0002mz-8N for submit@debbugs.gnu.org; Tue, 14 Jun 2016 12:29:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCrDv-0002mm-Sx for 23769@debbugs.gnu.org; Tue, 14 Jun 2016 12:29:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCrDp-0002nn-PF for 23769@debbugs.gnu.org; Tue, 14 Jun 2016 12:29:50 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:56226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCrD9-0002bi-27; Tue, 14 Jun 2016 12:29:07 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1bCrD6-0004Em-Iq; Tue, 14 Jun 2016 12:29:04 -0400 From: Glenn Morris To: phillip.lord@russet.org.uk (Phillip Lord) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> X-Spook: Ansar al-Islam Michoacna explosive Ron Brown Tornado Los X-Ran: ejwQ)fUcVH_g72D,.JS's>NSDF}3mV1v]X}%J|{-:1s5Jd8T860huTgFU7mu_o6^<\VO6" X-Hue: magenta X-Debbugs-No-Ack: yes X-Attribution: GM Date: Tue, 14 Jun 2016 12:29:04 -0400 In-Reply-To: <87a8ioyq9o.fsf@russet.org.uk> (Phillip Lord's message of "Tue, 14 Jun 2016 12:16:19 +0100") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -6.4 (------) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.4 (------) AFAIK Emacs doesn't support GIT_DIR, see eg https://debbugs.gnu.org/5344 . From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 14 13:03:35 2016 Received: (at 23769) by debbugs.gnu.org; 14 Jun 2016 17:03:35 +0000 Received: from localhost ([127.0.0.1]:40810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCrkV-0003bs-6l for submit@debbugs.gnu.org; Tue, 14 Jun 2016 13:03:35 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:48562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCrkR-0003bd-64 for 23769@debbugs.gnu.org; Tue, 14 Jun 2016 13:03:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=ZFvfErfQMUfUNQivfTMMDxOvkou9EXAui8zpLICKUaQ=; b=JlCU5RL6DW/AJfsSlM0SDNlAmz Vguqe2cHQ+LBK5Ab3ocFDMGWi64++fLhZSrlMtSbR3NM5pFGGZs4fl6ZP+s8rTtiIAvZbkPnHI4qQ BAcJsmHkG64x09jASL9C4xjcMSEnLT3vvdZ+ggZb4laoLhMCVGwP8MNZOdRVkICfJhDh1/ONo/bu5 Ya9U3lIQSv/9bT/AXSCR86QrNE124Um9DqwK/IdOTSx+oKrQUM20RBuRKMRYcouY+4FyNyZDCg6ON ViUPZw6Q1PIG20pfFVAFH4IUhjU5HmgIpWZG4o2oYFf8GMIR7Lm1MSCIOSLZqfbJwy/3BORqW1GCJ P6fLC2fw==; Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:59053 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bCrkL-001Yw6-2e; Tue, 14 Jun 2016 18:03:25 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Glenn Morris Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> Date: Tue, 14 Jun 2016 18:03:24 +0100 In-Reply-To: (Glenn Morris's message of "Tue, 14 Jun 2016 12:29:04 -0400") Message-ID: <87wplr1z4z.fsf@russet.org.uk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Glenn Morris writes: > AFAIK Emacs doesn't support GIT_DIR, see eg https://debbugs.gnu.org/5344 . Glenn Thanks for the pointer. The curious thing in this case is that GIT_DIR is not saying anything at all, other than the default. Emacs should not error under such circumstances. In my specific case, even a silent failure would be acceptable (cause I am using Emacs in batch -- I can't even see the mode line!). There's a patch attached that Bug report which never seems to have been applied. Phil From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 14 17:30:37 2016 Received: (at 23769) by debbugs.gnu.org; 14 Jun 2016 21:30:37 +0000 Received: from localhost ([127.0.0.1]:40905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCvuv-0006A0-FN for submit@debbugs.gnu.org; Tue, 14 Jun 2016 17:30:37 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:59879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCvut-00069m-2R for 23769@debbugs.gnu.org; Tue, 14 Jun 2016 17:30:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=2RG1exvlZmltjaSrCUrmh6w74RQkrXvr72apTC5p1gM=; b=J84muIIAbxmlZgPM2AfJD06IrZ 6hM1oPAbZb8JNiR5X+NotZgD84v9NnrqildWo1nODYTt5uhTXlv7+/TvdEUZDpHrZ0qkSI0YbY1iJ 9rsT/tDzMghs+zOE0I+6EetNgZkkjp1BSzqN5njkTlTnOLvP6ZMv2SJzAogVeLHgcgWWq6gKzORwo lIyKicvimcOUGXg+R+OmSOKIHtPbBmLLOzrzEKAZaMzMwbfDEPni7Aqlu4g+3WDKKljVUsXMb8fwZ wYcDhoi9IksMNJ2nf20cu7hOgVkOF3qwkFGkCGGIZt6U22WhnyhWJA/iMI+XniI/UyeEd0u9Mhd3R MBCVs/JA==; Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:60190 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bCvum-003382-Ug; Tue, 14 Jun 2016 22:30:29 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Glenn Morris Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> Date: Tue, 14 Jun 2016 22:30:27 +0100 In-Reply-To: (Glenn Morris's message of "Tue, 14 Jun 2016 12:29:04 -0400") Message-ID: <87shwf1mrw.fsf@russet.org.uk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Glenn Morris writes: > AFAIK Emacs doesn't support GIT_DIR, see eg https://debbugs.gnu.org/5344 . I think I have tracked the cause of the problem. It happens if a test opens a file in a subdirectory of the git root. When the file is opened Emacs checks to see whether the file is versioned. Somewhere down the line Emacs calls vc-git-working-revision, which eventually results in invocation of `git symbolic-ref HEAD`. All is good. Unless, GIT_DIR is set to ".git". Now, `git symbolic-ref HEAD` fails in subdirectories because GIT_DIR is still set to .git, when the .git directory is in the root. git symbolic-ref fails with 128 "Fatal: Not a git repository". Unfortunately, this is exactly the situation on a pre-commit hook. Git changes working directory to the root of the git repository, and then sets GIT_DIR to be .git. Potential solutions: 1) Ignore return values from git (fail silently) 2) Unset GIT_DIR (but I don't know why it is set by git, and I assume it is for some reason) 3) Run all vc-git commands from the root dir, and use fully qualified names. Will think further. Phil From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 14 17:52:59 2016 Received: (at 23769) by debbugs.gnu.org; 14 Jun 2016 21:52:59 +0000 Received: from localhost ([127.0.0.1]:40928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCwGZ-0006fg-A4 for submit@debbugs.gnu.org; Tue, 14 Jun 2016 17:52:59 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:35448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCwGX-0006fR-B7 for 23769@debbugs.gnu.org; Tue, 14 Jun 2016 17:52:57 -0400 Received: by mail-wm0-f43.google.com with SMTP id v199so139136109wmv.0 for <23769@debbugs.gnu.org>; Tue, 14 Jun 2016 14:52:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=PKlIiCvAF0kWXZHuNzjbKjs8SrfuTTdAEk2sd3/8w+k=; b=Ps3SyWEBjvyx02rgScGh+WkHnl4h2lr3RRS6nsNVPZuodGj8Ki4wuzJjF9IorDntO2 z+0mDmk62z6LQEv7pt7QgkzXEwr/ogk5SIiJbrfRxF6VgrE8OkqqqOJCn9A/0upAwamL tc6TnBo364p/vjpkNxGsA7rTYZU3AxwC4pAUoaEVysWtN3EkE/O0hv2FoirvqQ5EWAsb 3ISNcE9N4wUKROfCIbUObmWo4uNcbful0LLIPoVsIsSIXxn2NE7bHX2JtjFBu+1emStj n5yoCP6Ak1YSl709o/vuNAKv+Ph+Rlr5jF1/IPMPDYlqRG5UnJehKTMdbTtprUp9GkOA sbSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=PKlIiCvAF0kWXZHuNzjbKjs8SrfuTTdAEk2sd3/8w+k=; b=idQ+mFGnY6x9qfg+c+/m7QviTO3aM0+X7O4K5/OppoCO0MxCkYbAOyXbNF2yI0Yqzs iUTA+40Ir58YHOV/4uCw6LDim2OrO+QzHIr50pKcFp7tCf2CJiuD+qSB/OE5dt+Q3fwR p/3K/kABRHwo7wX54tVDeYRZuMrv+mIC9cQJSTTnlFZYsAZdUcC3lyOzzlGcRWAMuQfO N2wBnAixwAHlPfnqhHRL9hUR0f4N3x2/wLaJh3IQW11rzePZ18EUuwk/RPYqD3BFTFWQ TrQXVjAYAlbF6eqsMLzbbcFYgLSjvwTcyeIO8Y9OTDDYYlPyt8eYzKKxBqRPSUhfAvmm cWgQ== X-Gm-Message-State: ALyK8tIarH8td6q/gJ21p69j6UojsQ69ht4Ckz0rUmF3szlYN526IgbwMn9KqtOZ8VVdrg== X-Received: by 10.194.10.69 with SMTP id g5mr8078981wjb.7.1465941171150; Tue, 14 Jun 2016 14:52:51 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id q6sm7238874wjt.46.2016.06.14.14.52.49 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Jun 2016 14:52:50 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Phillip Lord , Glenn Morris References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> From: Dmitry Gutov Message-ID: <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> Date: Wed, 15 Jun 2016 00:52:48 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <87wplr1z4z.fsf@russet.org.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/14/2016 08:03 PM, Phillip Lord wrote: >> AFAIK Emacs doesn't support GIT_DIR, see eg https://debbugs.gnu.org/5344 . > There's a patch attached that Bug report which never seems to have been > applied. Have you tried it? Does it fix your problem? From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 14 18:21:10 2016 Received: (at 23769) by debbugs.gnu.org; 14 Jun 2016 22:21:10 +0000 Received: from localhost ([127.0.0.1]:40937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCwhp-0000TP-RU for submit@debbugs.gnu.org; Tue, 14 Jun 2016 18:21:10 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:33348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCwhn-0000SZ-5O for 23769@debbugs.gnu.org; Tue, 14 Jun 2016 18:21:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Cc:To:From:Subject:Date:References:In-Reply-To:Message-ID; bh=Ya50O9pqtieOGII0BHL4B9chbVGMYRYQSu0lQab10YQ=; b=pn5irPQ+rQjEmGsvANoIB16cww T2pkkxXSan05iHw8OYVUGmJN9HEZHf5g/AEf5/k1mZdRUL/nB6C4H2mhWl1CFhsftKKCCqPWw7nQu xXrEynpsvonE5qKycAiUVdvt1NBlsm+qi56hbGao/VxHn4eNMyDbbVv28SN8mg8L38VHjKDgIyj9W ccKT4Sjsh+WStKVeMu+mEXqh1iVfhDE9ml5O4uSQ20D2B39E7lpA0fPsravs8vYieGfjws0fgMOuX U2C+Bp+Xga7Qcy33635oeiPN5Zfy5NW1KxZJhkBgr5IeGs2Pwj+2uJBXo2jEMPikUqxqTPM60o++l 5KDk6ydA==; Received: from [127.0.0.1] (port=50971 helo=cloud103.planethippo.com) by cloud103.planethippo.com with esmtpa (Exim 4.86_1) (envelope-from ) id 1bCwhg-003F5g-RX; Tue, 14 Jun 2016 23:21:00 +0100 Received: from 77.98.219.118 ([77.98.219.118]) (SquirrelMail authenticated user phillip.lord@russet.org.uk) by cloud103.planethippo.com with HTTP; Tue, 14 Jun 2016 23:21:00 +0100 Message-ID: <16596a4bbb93efdc837beec3a9ecef21.squirrel@cloud103.planethippo.com> In-Reply-To: <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> Date: Tue, 14 Jun 2016 23:21:00 +0100 Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git From: "Phillip Lord" To: "Dmitry Gutov" User-Agent: SquirrelMail/1.5.2 [SVN] MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: Glenn Morris , 23769@debbugs.gnu.org, Phillip Lord X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) On Tue, June 14, 2016 10:52 pm, Dmitry Gutov wrote: > On 06/14/2016 08:03 PM, Phillip Lord wrote: > > >>> AFAIK Emacs doesn't support GIT_DIR, see eg >>> https://debbugs.gnu.org/5344 . >>> > >> There's a patch attached that Bug report which never seems to have been >> applied. > > Have you tried it? Does it fix your problem? Don't think it will, no. That patch is worth considering anyway, irrespective of this bug. Think I have a solution to this one though -- will try tomorrow. From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 15 16:48:47 2016 Received: (at 23769) by debbugs.gnu.org; 15 Jun 2016 20:48:47 +0000 Received: from localhost ([127.0.0.1]:42638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDHjz-00016h-GG for submit@debbugs.gnu.org; Wed, 15 Jun 2016 16:48:47 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:37480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDHjx-00016U-6k for 23769@debbugs.gnu.org; Wed, 15 Jun 2016 16:48:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:References:Message-ID :Date:In-Reply-To:Subject:Cc:To:From; bh=ukttUl0BgLfp86A46H3NjeQlNXOcH9w1uH/X/J6PHWE=; b=pNL+wKoml0l92HU9sYxqi02j8+ q6v1swOUPifr1jQltmHtCXJ8kdjDP0ZnHAWFuhZfOodC2TgG8B12tfgMMcr1YHve96WUxVIbpOMqA Qea8CEWgW+mlnTku7OQYMuWrfwvcBIPfZLRI1lUhAcMJtcFqTXWDCaJACLN96Xhy/XoL5AWE0aVi1 7CJT+AJtVzyc8tjUs0dfRkB1KYxGYW7N9QVxptO6djsCkDC31P3kY4zYXbdXcR/lwCyxcr0/SODKv QyksfVhDJzc5Iz6s4s9+vwc9jN9HSfJXOz60Iuae6VpYlXzxRvYMNUbUFDb3WwVjjiBERcHCdwIEv oEnWduoQ==; Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:46161 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bDHjq-002uXt-L0; Wed, 15 Jun 2016 21:48:39 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Dmitry Gutov Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git In-Reply-To: <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> (Dmitry Gutov's message of "Wed, 15 Jun 2016 00:52:48 +0300") Date: Wed, 15 Jun 2016 21:48:29 +0100 Message-ID: <877fdqkwki.fsf@russet.org.uk> References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: Glenn Morris , 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain Dmitry Gutov writes: > On 06/14/2016 08:03 PM, Phillip Lord wrote: > >>> AFAIK Emacs doesn't support GIT_DIR, see eg https://debbugs.gnu.org/5344 . > >> There's a patch attached that Bug report which never seems to have been >> applied. > > Have you tried it? Does it fix your problem? The following patch addresses this bug. John/Eli would you want this for Emacs-25. I've noticed from instrumenting vc-git that it's not just the symbolic-ref command that returns 128, but several others. So, it might be that the best long term solution would be to make change vc-git--call to set the default directory to the root, which would make GIT_DIR=.git always correct. At the moment, though, I've noticed some git commands are called with simple file names, and some full, so this would probably require more changes. No sense in making this sort of change for Emacs-25 now. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Fix-error-from-vc-git-when-GIT_DIR-is-set.patch >From 0419734fd39f8cd67472c0294295ef1508e39d85 Mon Sep 17 00:00:00 2001 From: Phillip Lord Date: Wed, 15 Jun 2016 17:36:42 +0100 Subject: [PATCH] Fix error from vc-git when GIT_DIR is set * lisp/vc/vc-git.el (vc-git-working-revision): Set default-directory to repository root to prevent an error when GIT_DIR is relative to it. * test/automated/vc-git-tests.el: New file. Addresses Bug#23769 --- lisp/vc/vc-git.el | 8 ++++-- test/automated/vc-git-tests.el | 60 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 test/automated/vc-git-tests.el diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index f35c84d..ea26a7d 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -260,9 +260,13 @@ vc-git-state (vc-git--state-code diff-letter))) (if (vc-git--empty-db-p) 'added 'up-to-date)))) -(defun vc-git-working-revision (_file) +(defun vc-git-working-revision (file) "Git-specific version of `vc-working-revision'." - (let (process-file-side-effects) + ;; Call this in the root directory, or Emacs may error when setting + ;; the modeline when called from a git pre-commit hook, which sets + ;; GIT_DIR. (Bug #23769) + (let ((default-directory (vc-git-root file)) + (process-file-side-effects)) (vc-git--rev-parse "HEAD"))) (defun vc-git--symbolic-ref (file) diff --git a/test/automated/vc-git-tests.el b/test/automated/vc-git-tests.el new file mode 100644 index 0000000..8001bcb --- /dev/null +++ b/test/automated/vc-git-tests.el @@ -0,0 +1,60 @@ +;;; vc-git-tests.el --- tests for vc/vc-git.el + +;; Copyright (C) 2016 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;;; Code: + +(require 'ert) +(require 'vc-git) + +;; This will break when merged from the emacs-25 branch to master, +;; because of the change of directory structure. The actual file is +;; not important at all, so long as it is checked into git. +(defvar vc-git-tests-file + (concat + (expand-file-name + "data/xref/" + (file-name-directory (or load-file-name (buffer-file-name)))) + "file1.txt")) + + +(ert-deftest open-this-file () + "Test for Bug #23769." + (should + (let ((git-dir (getenv "GIT_DIR"))) + (unwind-protect + (progn + (setenv "GIT_DIR" nil) + (find-file vc-git-tests-file)) + (when (get-file-buffer vc-git-tests-file) + (setenv "GIT_DIR" git-dir) + (kill-buffer (get-file-buffer vc-git-tests-file)))))) + (should + (let ((git-dir (getenv "GIT_DIR"))) + (unwind-protect + (progn + (setenv "GIT_DIR" ".git") + (find-file vc-git-tests-file)) + (when (get-file-buffer vc-git-tests-file) + (setenv "GIT_DIR" git-dir) + (kill-buffer (get-file-buffer vc-git-tests-file))))))) + + +;;; vc-git-tests.el ends here -- 2.8.4 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 15 17:02:23 2016 Received: (at 23769) by debbugs.gnu.org; 15 Jun 2016 21:02:23 +0000 Received: from localhost ([127.0.0.1]:42643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDHx8-0001UA-RJ for submit@debbugs.gnu.org; Wed, 15 Jun 2016 17:02:23 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:37677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDHx6-0001Ty-PT for 23769@debbugs.gnu.org; Wed, 15 Jun 2016 17:02:21 -0400 Received: by mail-wm0-f47.google.com with SMTP id a66so29947721wme.0 for <23769@debbugs.gnu.org>; Wed, 15 Jun 2016 14:02:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=xqDtoba8/Tqj3D/+1udT+EIAGDS6bRFASeWb20kaBpI=; b=L7/jXK5rWkPBjxQXfHSURXYQDrVYrNnKrZA2Z5D3x7S8uy3y4N8cX/Iwc8hyM4Dx3H oXobCXjiih7/n4P3AsYTDKtj+Bn8/4UDoKaa+paPnt+j0EjWBsOHEFb5wTyG6xsDkcX1 tlrhyn8JeUXru2/OkMNoBfhU0qD0TayZJYBzFSwv7SeZvjVlyWpznBdupPrOqc47msGV xKTz+FR/29Jqu95qtNGB98iD96YRSJBKs2kAZvtoXwk3Se57vHI/U76tuCbueofB/fXB VeHD7fMIwb2h2wAVjom7OTZH/8Bh45ItpgCpu1g+bLZEX2DiL3mpouhEPlQm7pFJh9vk cGAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=xqDtoba8/Tqj3D/+1udT+EIAGDS6bRFASeWb20kaBpI=; b=DMMRKHdFFSnoIgBRRlmJTb9GDKg3R//YYQlJUC+4IGm2eeCwfc+qmgtxxca5jgiP+7 0fyFlbMl98pMXHYnK4J097lPzso9qrrSBAETIhHvSB//R6+OQ6rQQYqCPiifrcVuXnoY FH36tYGMEbIShhSkkiwQe8gibTLAtvm7cicDN+FBwwpRTZRnjxANmTjZ+8YfuWTvxf8E Kxbbf7sY8+ixBQQM0QCvlpI/+tAHvFl3ZUm2wzkgEI2oMIA9BTFZSH38N7TIkOyDF5FM JxVo3aBjqQkt6ioexrQz+wPn3Ow9mKzW34RrEFSMwPosBsJ+GZzhGsG6W1vEi4ZKLngs Lubw== X-Gm-Message-State: ALyK8tJOgygjzdXOtwXOOTyUEmifDn7//v4syectlGicqtq4sf+20SVcDaGLQIfZd/fUuQ== X-Received: by 10.194.150.130 with SMTP id ui2mr544713wjb.11.1466024534912; Wed, 15 Jun 2016 14:02:14 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id db6sm40235189wjb.2.2016.06.15.14.02.13 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Jun 2016 14:02:14 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Phillip Lord References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> From: Dmitry Gutov Message-ID: <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> Date: Thu, 16 Jun 2016 00:02:12 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <877fdqkwki.fsf@russet.org.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: Glenn Morris , 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/15/2016 11:48 PM, Phillip Lord wrote: > I've noticed from instrumenting vc-git that it's not just the > symbolic-ref command that returns 128, but several others. So, it might > be that the best long term solution would be to make change vc-git--call > to set the default directory to the root, which would make GIT_DIR=.git > always correct. The patch looks wrong. Why does the problem script set GIT_DIR to '.git'? In all examples I've found, this variable is set to an absolute value. In general, its purpose, it seems, is to point to the '.git' directory when it's named otherwise and/or is situated somewhere outside of the current directory tree. The latter situation will break vc-git-root. As such, the submitted patch is only likely to work in the tautological case you've descried. And it will add some performance penalty to each call, because vc-git-root, though usually fast, is not free. > At the moment, though, I've noticed some git commands are called with > simple file names, and some full, so this would probably require more > changes. Indeed. From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 15 17:56:12 2016 Received: (at 23769) by debbugs.gnu.org; 15 Jun 2016 21:56:12 +0000 Received: from localhost ([127.0.0.1]:42658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDInE-0002ox-4l for submit@debbugs.gnu.org; Wed, 15 Jun 2016 17:56:12 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:36278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDInD-0002oj-2M for 23769@debbugs.gnu.org; Wed, 15 Jun 2016 17:56:11 -0400 Received: by mail-pa0-f44.google.com with SMTP id b5so11147017pas.3 for <23769@debbugs.gnu.org>; Wed, 15 Jun 2016 14:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:mime-version; bh=C6PoLPg6V77vDDWMn1fE+RVSrUqjlEqiMpFhTe7DFhA=; b=ir5pTsq0SDownzZ6CMdrj+/uhE8liGEAeZ2810A+q6EyVuKmLWDAyd0slOF73EY+uN V2t0eJF6pyOWCvO9L+B2m5MlGB6y5lp1Ux0xhWohXm2UMriDVI8NKP61o7wXnptiQjj3 J7uk5dWx2LXJ3Wqfc54Uhyfcrh6kYHlkMkkX6xPeeox42J5NqQrnkzFoU0u0SY0peXI7 DS1wHIJn2Te82EPD1gYIb5HIbQrWGTbVVrr9LZAvAjf95LzG75WTtairDDTJdZ4USq3u RwSxt95miiHO79rxy8sye8zgdpMi0KiXC4AL+jg2vpozIQa/ANfM26ePFUUD4gBiJY8B mrxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:in-reply-to:date:message-id :references:user-agent:mime-version; bh=C6PoLPg6V77vDDWMn1fE+RVSrUqjlEqiMpFhTe7DFhA=; b=ZltwkSebQQQA/5ln876r1blCRsrmnL1ChU2oZrKDtiRzcZD5gWwu1Vv94dfnCNJVwH ZZLeHYQez5ayM7AG2NbOdZv/U4RJvnHa2zdFrtf3Ttc9aujbvWQi1GY5R0V4kIj6Iot/ wWgFdMuprNnLWLEtXfeZKK3PQoOAULJ95YMwtW9iHUHTQML1Ajbzd5w+KKinakBQ1knH n3RRYVF6RSGjlwaOLhednW5Dl8qDPPCKvt4dqvmpvMXittqxA3FTU9Yw3bzRsfj4K9NK 4yGbEzIRuW8tzi/sNG/WrKPHxtSAYhWeSBbjaKU9rXQ8N4rl8hwqrUG7MV7I45N9qPgL Cv8A== X-Gm-Message-State: ALyK8tJFGPMNT9uWBglvfYZ8gBp1ZaNxPlMYAY9WdAuAtP3oin+Lk8tk2bDEnhDHzati+A== X-Received: by 10.66.168.13 with SMTP id zs13mr1036931pab.68.1466027765143; Wed, 15 Jun 2016 14:56:05 -0700 (PDT) Received: from Vulcan.local (76-234-68-79.lightspeed.frokca.sbcglobal.net. [76.234.68.79]) by smtp.gmail.com with ESMTPSA id ut6sm55251386pac.37.2016.06.15.14.56.03 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 15 Jun 2016 14:56:04 -0700 (PDT) From: John Wiegley X-Google-Original-From: "John Wiegley" Received: by Vulcan.local (Postfix, from userid 501) id 71C7794D2BA; Wed, 15 Jun 2016 14:56:03 -0700 (PDT) To: phillip.lord@russet.org.uk (Phillip Lord) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git In-Reply-To: <877fdqkwki.fsf@russet.org.uk> (Phillip Lord's message of "Wed, 15 Jun 2016 21:48:29 +0100") Date: Wed, 15 Jun 2016 14:56:00 -0700 Message-ID: References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/25.0.95 (darwin) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, Dmitry Gutov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable >>>>> Phillip Lord writes: > The following patch addresses this bug. > John/Eli would you want this for Emacs-25. This can wait until 25.2, since no one has had a chance to use this in the pretests. =2D-=20 John Wiegley GPG fingerprint =3D 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGcBAEBCgAGBQJXYc7wAAoJEMFE2PTxn+YwSeIL+wQQuBDvbhje54wrzMVio9+k sey08bdyeuAz/I8xftPPeBEzh7M2nz+AW+HYErELut5HA30QvqOwKhsw8/bsrHae o46TJSR9Y7XKSHqlGPbE2m8lPrrYZ4xUhvTsWrFhvS2xJcBJdYCv4SwUcbWWrihr FBlPLgwfjYmYXcX5vNNMsYdaieszc2Pw/ploeAmQv6XFyaP7Om4bhQT4RUFrXT3v reuqaIre5GpeCUXRvNFcsugvwlcEaX7yd2eL5oR/xj52mRoXS2J/iDp+JGN9seTj CIl6InrQ+qzjVG6uR0+LHGB63y5lUmuavkTWGY/VywEeQq9ExecP3KWTl2C8K6nn ZBV4ERAdYT8RJsmUcAsnJ+z0k/2443Wocy40IbD9fEguI1TMQxqC0rEAI2H5YtNd gAkqZB1J74rOm5D3D1E7qPoZIgDwGyBFK/ZiCW09XzmVGB+AcPGTWw5CMqTlnzWh R5yszccRgMW2Vsfjb2eB0McclPj8oPiDlhXfRjEg+A== =ORBg -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 15 18:10:04 2016 Received: (at 23769) by debbugs.gnu.org; 15 Jun 2016 22:10:04 +0000 Received: from localhost ([127.0.0.1]:42665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDJ0a-00039c-EM for submit@debbugs.gnu.org; Wed, 15 Jun 2016 18:10:04 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:40865) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDJ0V-00039J-9D for 23769@debbugs.gnu.org; Wed, 15 Jun 2016 18:09:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=UHaM0LUr3zmZeZiRAp3kuyjttnBjrLkUkJ97Vt84Juc=; b=kQD8GJdYTAP5vJZd9xn8i21S2z LpJWyMcjb4s9jQDypxJWZ3nHLjvxwIcS4KPBY3J5WLNfLiQLR7oiNdcV9mddrtxf72NUMZGou/CXh vG+COC+UtHMss35jUvLnPW8fVDDTUvnj0HUpCEx/8rFW8Hx7pSkw70QHPNsD4C+MsHqIBCMEwSxh2 P1V7/0AEMGf5JUMa0Am0a8fxNqX1PCIDM+327Gl8FSXmzQmVRzHciAGcMeoiumge225/TYSMb7/7K 4RA1hpkRE07FC+T8v1eccUmOH1S4S8MlExnef288vGRgu7Ypv7hgw0noqtwXIEnlTZ0iQ0CEAILgc 2afmiuaQ==; Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:46521 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bDJ0P-003APa-4E; Wed, 15 Jun 2016 23:09:49 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Dmitry Gutov Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> Date: Wed, 15 Jun 2016 23:09:48 +0100 In-Reply-To: <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> (Dmitry Gutov's message of "Thu, 16 Jun 2016 00:02:12 +0300") Message-ID: <871t3y85oz.fsf@russet.org.uk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: Glenn Morris , 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Dmitry Gutov writes: > On 06/15/2016 11:48 PM, Phillip Lord wrote: > >> I've noticed from instrumenting vc-git that it's not just the >> symbolic-ref command that returns 128, but several others. So, it might >> be that the best long term solution would be to make change vc-git--call >> to set the default directory to the root, which would make GIT_DIR=.git >> always correct. > > The patch looks wrong. Why does the problem script set GIT_DIR to '.git'? Try it on a pre-commit hook. CWD is set to the root, and GIT_DIR is set to .git. Other people have found this: http://longair.net/blog/2011/04/09/missing-git-hooks-documentation/ AFAICT, it's not actually documented by git. Or it is but the documentation is incomprehensible (hey, it's git, it could happen!). > In all examples I've found, this variable is set to an absolute value. In > general, its purpose, it seems, is to point to the '.git' directory when it's > named otherwise and/or is situated somewhere outside of the current directory > tree. > > The latter situation will break vc-git-root. That situation does indeed happen. For example, I normally checkout emacs into worktrees where you get this when commiting on emacs-25 branch which is a worktree off master. /home/phillord/src/git/emacs-git/master/.git/worktrees/emacs-25 But in this case, I think vc-git-root will still work. (defun vc-git-root (file) (or (vc-file-getprop file 'git-root) (vc-file-setprop file 'git-root (vc-find-root file ".git")))) We still find ".git" because it is a *file* (not a directory) at the top level of a worktree. > As such, the submitted patch is only likely to work in the > tautological case you've descried. It's definately a risk. Git does many things, and people use it in many ways. > And it will add some performance penalty to each call, because > vc-git-root, though usually fast, is not free. Not free, but it is a constant time look up after the first. There is a simpler option. I am trying to solve the root cause of the problem but, as you say, that might be fraught. Since the problem only seems to cause an error with vc-git-mode-line-string, we could just discard the error from vc-git-working-revision in this case. Failing that, now I know what the problem is, at least I have a workaround (unset GIT_DIR in the pre-commit hook). Phil From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 15 18:28:02 2016 Received: (at 23769) by debbugs.gnu.org; 15 Jun 2016 22:28:02 +0000 Received: from localhost ([127.0.0.1]:42682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDJI1-0003bN-Oj for submit@debbugs.gnu.org; Wed, 15 Jun 2016 18:28:01 -0400 Received: from mail-oi0-f46.google.com ([209.85.218.46]:33075) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDJI0-0003b0-0V for 23769@debbugs.gnu.org; Wed, 15 Jun 2016 18:28:00 -0400 Received: by mail-oi0-f46.google.com with SMTP id u201so42376701oie.0 for <23769@debbugs.gnu.org>; Wed, 15 Jun 2016 15:27:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=+qiMkzhBIc2jPWH0jq3ySxe2EI/hkJN7Anfcpmf/3Ck=; b=0ml8ZCMXLub408L8tFCiuqlcuH42xYXDUMztq40nQerslKXbFal7GynnCs3UehnIyX gpek3YUC2htUUlTzGxQTlw8kBFrm0retoScHDqmEwUIq1cbcz1Nt65Ck8OpNZ+4r/QKI XQgomn2P1gFxpvBviYncn6M5b/EgRmU5jpl9/RNbmcfJnMv8A3I1O2i+sJ5Ot3+hNWOS smrLmvUmpsdPEADQsIBTV1vEq23m1nxzUbh6sQYia4GVVhK1c9DJXDySmwyFdlppHahk vyvhl8oLhN3ZyRQdNqXWoZaDOOz7pBgvxqzQt1VpGpZx6XqKMNR52yOB9Lspts9t79cU Trxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=+qiMkzhBIc2jPWH0jq3ySxe2EI/hkJN7Anfcpmf/3Ck=; b=Rb6wA5cdqIN6hbZeH8wAuQQ9wVo+YAKnam13h4hhJoA7Y8o2C9IfuAAWUQc8XzgR0s DmUFTR7WZYHnVzrUrBDDtR5Azpjr1FwUD5Zjkx/zqoMFqQJAVdKUCgwtgiUOkU/6DK7X asAw+yqLsFC8qca7U6yB/vch5hrukdWOhT3z9yYAxIrbNo/9RDCAH/EDFhFzrgnByL4N uSy4f6CN4zfACByrsdLIm7kGz95pX/PtX/PSOW+cuRKDr0IO39KYr9wJEppZknh4arbM kiOP1UOr7u3GiQNuh/6niDhYn2vX337GOH83TWnxvloja4pzzOFTw5ppq9g3gwP9q2CF MTNA== X-Gm-Message-State: ALyK8tIa/FufLXXtWsUHnUi7nHXI5wsZOOiW9nhIbGmDLaSQUeFc6Kw03fNJAd/ateY32ujH08YKUeR0pJCpUw== X-Received: by 10.202.197.137 with SMTP id v131mr622381oif.178.1466029674498; Wed, 15 Jun 2016 15:27:54 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.44.103 with HTTP; Wed, 15 Jun 2016 15:27:53 -0700 (PDT) In-Reply-To: <871t3y85oz.fsf@russet.org.uk> References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> From: Noam Postavsky Date: Wed, 15 Jun 2016 18:27:53 -0400 X-Google-Sender-Auth: VbwW3DC4nMddUFwwGa7-2CnXV6k Message-ID: Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Phillip Lord Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, Dmitry Gutov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On Wed, Jun 15, 2016 at 6:09 PM, Phillip Lord wrote: > > Failing that, now I know what the problem is, at least I have a > workaround (unset GIT_DIR in the pre-commit hook). Apparently this "_the_ right way to write hooks that touch the files in the work tree." http://permalink.gmane.org/gmane.comp.version-control.git/136276 From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 15 19:21:05 2016 Received: (at 23769) by debbugs.gnu.org; 15 Jun 2016 23:21:05 +0000 Received: from localhost ([127.0.0.1]:42700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDK7M-0004qA-S8 for submit@debbugs.gnu.org; Wed, 15 Jun 2016 19:21:05 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:35904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDK7K-0004pL-Cv for 23769@debbugs.gnu.org; Wed, 15 Jun 2016 19:21:02 -0400 Received: by mail-wm0-f48.google.com with SMTP id f126so29416647wma.1 for <23769@debbugs.gnu.org>; Wed, 15 Jun 2016 16:21:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=u56jCGAP/jslZo2mivZWTncTzqziQvzNFVPveis59Bc=; b=TY2TJlepMO2B2KuQyYmDjOJRdeTd4xg31IV+ayeKrGq64lvKrVka3jXSSHlyIDgoVk BSI3ycOXA5mjGg0zJLEwZBQ1G52mRqGIYPh9aBnEEsO+I9xY6dMNXIp+z7UERtkmtCHj kGvM21YAXegTf+3GUdAA0+UpiwmQuAwQ32wXxe5cM++PsX3DZUO5qqlEo6fo4evrhNh/ Hx8tcuRaqWMbkGKsXj87HLIGLmAlitCT/IFUb0Ft3caOjvqC52QjociEXeeaXYtMWbHY TUrpZS/c4T67QoqQz9suGagzhpDXx8yD1Cv4jGoPdPzlbpqR7yvEKjd7WCbLtH9AaJtv Giog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=u56jCGAP/jslZo2mivZWTncTzqziQvzNFVPveis59Bc=; b=bmfsx62iZpultHOTHy7mY3DHwZU4B/bMDQ/CXZImIDUgyf0pe2H4FfmnQh0kDBUruP 41ikeMwJew8I+jUNBy/kCvo/6z2R1+pa1W/TIFkSq+eITcV1wD7QYHXIhOsZr4rIXHoS j732LrEvOSSCyZSA1/xzkYGY6+V85hbWkXynjNMfIGh3e0rUKatpRyLUNkqyVo4q96TO tL1LywgTno6agB+M26pMqZ6K4YBmFZCaHYAVUtr4+nzlUt1z+YsqA6yFeAyCM9rzbAVC 6/ZuzntEEk7ifLDqt6nZpkR6HcJ0xM3OzCebE+hfmUFwKeQj3ryZrq54qRuUvCUd170B zJww== X-Gm-Message-State: ALyK8tLpxNJtPngeOvsf4X18lYTyDyRAJ9qiN8dRJBaG5wUZBMcoiBsAdo4A6AZEi8IEZA== X-Received: by 10.28.109.137 with SMTP id b9mr11962386wmi.68.1466032856516; Wed, 15 Jun 2016 16:20:56 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id y6sm702158wmy.8.2016.06.15.16.20.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2016 16:20:55 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Noam Postavsky , Phillip Lord References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> From: Dmitry Gutov Message-ID: <87e22f3a-27d2-338e-05f7-b3ab820dbe5f@yandex.ru> Date: Thu, 16 Jun 2016 02:20:53 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/16/2016 01:27 AM, Noam Postavsky wrote: > Apparently this "_the_ right way to write hooks that touch the files > in the work tree." > > http://permalink.gmane.org/gmane.comp.version-control.git/136276 Is it the same behavior we're talking about? The thread says that GIT_DIR is set to '.', not to '.git'. I doubt the former setting would mesh well with binding default-directory to repository's root like the patch proposes. From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 15 19:26:01 2016 Received: (at 23769) by debbugs.gnu.org; 15 Jun 2016 23:26:01 +0000 Received: from localhost ([127.0.0.1]:42704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDKC5-0004ww-FT for submit@debbugs.gnu.org; Wed, 15 Jun 2016 19:26:01 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:36233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDKBz-0004wa-2g for 23769@debbugs.gnu.org; Wed, 15 Jun 2016 19:25:56 -0400 Received: by mail-wm0-f51.google.com with SMTP id f126so29499817wma.1 for <23769@debbugs.gnu.org>; Wed, 15 Jun 2016 16:25:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=pCv7AGPJM3I/vCcLkqVWeLVkx50+YMUzabbMnB+Z9F0=; b=JxNYJo+lgwE7MrU7ffY1TYP7MO45xD8HfSAbjvGqMOYSGepvg88RYGMMujrgLjLjt7 SDtBf9xLE0HknnV4YoHUGKNWWKjCBkNQf4htBSwHNPZfYKkj2pfO4m/QT4VPf7F72Gb5 4tI53iZdyeS/j+aBB354Tx2gP8TByzUcyE4k0OpqYxHKPg12Jb/oOpDD6R+Aq37EWq9b LejM1I7lPnal/oRBPoBdOUZ2O1E/E8B+VSUJ1u5MM1n0YnWmmA5lairlc55pe9hvinA8 kuSgJaBzSrEvWpr+fpapw25QQVY/xlr+AkvGKNI7LpWu1oJPM1tZdN4c9cGwKl3euYmm 7qSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=pCv7AGPJM3I/vCcLkqVWeLVkx50+YMUzabbMnB+Z9F0=; b=lrucBtMWPKWYKkeRiGL5KWsaXxzde/s6Xh1Xu9DQYvA5ITyYDPVZE/0dN0wSGWHvGs EtT3nLS0fPbR8W4Qafer6lqeEizeYgDz5HTzmmxGIjfXS0Xneh0wkgw+y1L9WbqAa7oA njVtH+J843249efBU2yCkPNZBhnXVhpLnSaZ3VsFj89Cwl8qtJVT/e2MAh0sU4+sJ24f z53/TD9dgLJx64tzw5OsWvWM43l6khUe+OBzj/FZZFiU6tydK3zDCa+PGc2G2L3AzCWn b9v0RB0oHkEnRgOWIFyybMKGNh+FVKBNJ48s5QbjqKr11DflDqBtbMGdN6qXiRm5f2O0 IQgQ== X-Gm-Message-State: ALyK8tLsC2TxGBylPmm/z79xJwsUFUkwM9y5DrQFxPgXprYikMqm3HQ5ThRNf/bD/6nWMA== X-Received: by 10.194.114.163 with SMTP id jh3mr352596wjb.173.1466033145543; Wed, 15 Jun 2016 16:25:45 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id o2sm14117426wjp.26.2016.06.15.16.25.44 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Jun 2016 16:25:44 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Phillip Lord References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> From: Dmitry Gutov Message-ID: <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> Date: Thu, 16 Jun 2016 02:25:43 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <871t3y85oz.fsf@russet.org.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: Glenn Morris , 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/16/2016 01:09 AM, Phillip Lord wrote: > Try it on a pre-commit hook. CWD is set to the root, and GIT_DIR is set > to .git. Other people have found this: > > http://longair.net/blog/2011/04/09/missing-git-hooks-documentation/ OK, so hooks set it themselves. > AFAICT, it's not actually documented by git. Or it is but the > documentation is incomprehensible (hey, it's git, it could happen!). Yup. > That situation does indeed happen. For example, I normally checkout > emacs into worktrees where you get this when commiting on emacs-25 > branch which is a worktree off master. Does git-worktree use GIT_DIR in some way? > There is a simpler option. I am trying to solve the root cause of the > problem but, as you say, that might be fraught. Since the problem only > seems to cause an error with vc-git-mode-line-string, we could just > discard the error from vc-git-working-revision in this case. That sounds like a last-resort option. > Failing that, now I know what the problem is, at least I have a > workaround (unset GIT_DIR in the pre-commit hook). We could also unset GIT_DIR locally inside vc-git--call. At least when it's set to a known value such as '.git'. From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 03:12:07 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 07:12:07 +0000 Received: from localhost ([127.0.0.1]:42847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDRT9-0000xg-3T for submit@debbugs.gnu.org; Thu, 16 Jun 2016 03:12:07 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:36106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDRT4-0000x1-8h for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 03:12:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=yitI1cJaqsW9WRe+da2jJeN/yEVosPj7JZnwSmM0wck=; b=G5EcvNVvs3mtz1KMxF+iiWEMzX Czc63uZSo1rpk8xB0qxzjIRtdm/rZqhdVrd9U2L/57qZ/MNtjT0Gjr5L1FXtuoSvXcR+EjVW8epjU q3w7CZbYQ+LY0OcrVkf9lw+DTDJJcLUXeINpID4aM8GCUXNMiyeskb7bWlSn7Ta6YGJ74F/1GGDN0 sycGM49xxSgJFJUWsd0Q0XxkfUpudlZNPIJQFqJ7jQMkkXxN8B0fWYglEiZGNsIn0XqL0/V+o3gph 0+F+Cw5IXOujAnamPtoh6/il6uVbD93vKQPeaiRHzHkGbEem7rHmU80M3mzwQfNDznDuNLH203pKE Fkcacm4g==; Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:46706 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bDRSx-0002oG-Vx; Thu, 16 Jun 2016 08:11:52 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Dmitry Gutov Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <87e22f3a-27d2-338e-05f7-b3ab820dbe5f@yandex.ru> Date: Thu, 16 Jun 2016 08:11:50 +0100 In-Reply-To: <87e22f3a-27d2-338e-05f7-b3ab820dbe5f@yandex.ru> (Dmitry Gutov's message of "Thu, 16 Jun 2016 02:20:53 +0300") Message-ID: <87ziqlzjyh.fsf@russet.org.uk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, Noam Postavsky X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Dmitry Gutov writes: > On 06/16/2016 01:27 AM, Noam Postavsky wrote: > >> Apparently this "_the_ right way to write hooks that touch the files >> in the work tree." >> >> http://permalink.gmane.org/gmane.comp.version-control.git/136276 > > Is it the same behavior we're talking about? > > The thread says that GIT_DIR is set to '.', not to '.git'. I doubt the former > setting would mesh well with binding default-directory to repository's root > like the patch proposes. According to this: http://longair.net/blog/2011/04/09/missing-git-hooks-documentation/ that's for the post-recieve hook. In this case CWD is the git directory. The logic of this is (I guess) that it works also in a bare repo. pre-commit can only ever run in a non-bare repo since you cannot commit if you don't have a worktree. I suspect emacs will not be affected by this because if anyone did run emacs in post-recieve they would only touch files *inside* the git repo which Emacs would identify as not version-controlled. But, again, it illustrates the point that GIT_DIR can (and is often) set to a relative directory. Phil From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 03:41:29 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 07:41:29 +0000 Received: from localhost ([127.0.0.1]:42861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDRvc-0001d4-Qn for submit@debbugs.gnu.org; Thu, 16 Jun 2016 03:41:28 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:37111) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDRva-0001cs-UB for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 03:41:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=mXKQ+UO1OaK94fOW40AtVeVF8i8DOD58mqiNSuAqXsA=; b=K3L9bsuJzmNdi2Wp4o3vFfMV/s iAEtinAV+oS7TG0YqC3duoAlb/pfGF89D3ZyM4LFSj+yXUPW9BeQJHCskPuLpaeCa5JEeC+bmOuZW oioYD88+GurgsMlbE83Evx7f3LTCyYl1lZFXKpMFMPhUp5okKvpCYoBu4K/bD0ov3Xv+upqjTcagR Ep9oYvQdj7/V7q49+8/KNxzn5cQewBFMT5Qt9RVv5LNygfl9xfGiUgMt/7t24EkrGmX8TNSUH7rd/ voJ+YZjONYzWGjY2EGCuJf5CjwMHo6F5jBYKTWdKn7Iy9MrQC7ImTfbHGdf1jxylvFCN3bD60SAwr C/z+Ognw==; Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:46760 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bDRvV-0006tL-3j; Thu, 16 Jun 2016 08:41:21 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Dmitry Gutov Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> Date: Thu, 16 Jun 2016 08:41:20 +0100 In-Reply-To: <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> (Dmitry Gutov's message of "Thu, 16 Jun 2016 02:25:43 +0300") Message-ID: <87vb19zilb.fsf@russet.org.uk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: Glenn Morris , 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Dmitry Gutov writes: > On 06/16/2016 01:09 AM, Phillip Lord wrote: >> That situation does indeed happen. For example, I normally checkout >> emacs into worktrees where you get this when commiting on emacs-25 >> branch which is a worktree off master. > > Does git-worktree use GIT_DIR in some way? Well, it uses the directory that GIT_DIR points to (so master/.git/worktrees/emacs-25 contains COMMIT_MSG, HEAD, index and so on). Whether is uses GIT_DIR, who knows. I pressume that all git commands obey GIT_DIR. >> There is a simpler option. I am trying to solve the root cause of the >> problem but, as you say, that might be fraught. Since the problem only >> seems to cause an error with vc-git-mode-line-string, we could just >> discard the error from vc-git-working-revision in this case. > > That sounds like a last-resort option. It's certainly true that it would nice to fix it elsewhere, but I am unconvinced that setting the mode-line should ever result in an error as a normal part of it's operation. >> Failing that, now I know what the problem is, at least I have a >> workaround (unset GIT_DIR in the pre-commit hook). > > We could also unset GIT_DIR locally inside vc-git--call. At least when > it's set to a known value such as '.git'. Yep; I guess, we know exactly what vc-git--call does with git, and if it never depends on GIT_DIR that should work. Although setting and unsetting GIT_DIR seems a bit of a pain. Personally, I prefer my first option of calling git consistently -- always with CWD equal to root, and always with file paths relative to the root. This way, GIT_DIR should not matter. I presume the vc.el facade allows this, but if so, as this is going onto master now, there is time. Phil From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 03:45:48 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 07:45:48 +0000 Received: from localhost ([127.0.0.1]:42867 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDRzo-0001jI-BO for submit@debbugs.gnu.org; Thu, 16 Jun 2016 03:45:48 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:37257) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDRzm-0001j6-Nd for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 03:45:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=5TRUGFH8qWbhvPvaWXOio5Nff7LICPfEz2NAi9jTCtw=; b=kCupBMzvbdJtJzjx3Tr5kdj6U+ +iZHGGORWdmjgarudmfazNsWZQpZJJTCLezGxsYvqL1bAhkPYrYt1JXq9L52SmBOgyEGGKiULI7RT uq8VlHOYwYIILwruzqetm6KEPtFzJ/7FkvwoRy/jebqSY9XRbwtutO9j6QzgwLmQ4lXbSWQ45Nhzj B6ZS8JWBLpH11CILA0tmVVZrS21+UWbkgiiAtNGC1/aZUilL48KKYGY41c6UgmgJ9GSDG7OY+bvWi jbGijwO99mqs+T/yA1yJfsQPvgUeQ0Qse1RgYUSK8qAdJcWFTO9sT91u12vCOztz3ibJsTz/4JY1s oy6/qTVQ==; Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:46772 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bDRzh-0007aG-04; Thu, 16 Jun 2016 08:45:41 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Noam Postavsky Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> Date: Thu, 16 Jun 2016 08:45:40 +0100 In-Reply-To: (Noam Postavsky's message of "Wed, 15 Jun 2016 18:27:53 -0400") Message-ID: <87r3bxzie3.fsf@russet.org.uk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, Dmitry Gutov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Noam Postavsky writes: > On Wed, Jun 15, 2016 at 6:09 PM, Phillip Lord > wrote: >> >> Failing that, now I know what the problem is, at least I have a >> workaround (unset GIT_DIR in the pre-commit hook). > > Apparently this "_the_ right way to write hooks that touch the files > in the work tree." > > http://permalink.gmane.org/gmane.comp.version-control.git/136276 I agree that this will work. But it worth reading the justification -- "in earlier versions of git" -- so that will be git 1.6 latest, as the post was in 2010. So, I don't think that Emacs should *require* this to be the case. git doesn't appear to any more. Phil From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 07:25:30 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 11:25:30 +0000 Received: from localhost ([127.0.0.1]:42946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDVQP-00077w-Pz for submit@debbugs.gnu.org; Thu, 16 Jun 2016 07:25:29 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:34651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDVQO-00077j-Da for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 07:25:28 -0400 Received: by mail-wm0-f42.google.com with SMTP id k184so31557974wme.1 for <23769@debbugs.gnu.org>; Thu, 16 Jun 2016 04:25:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=CMpOe0BTU4zorq7uy2Xl9V8IEX0KfpTRENrguiofs0c=; b=fIk58wUfBwjJKY/2aYLAn43GU0sn0P75tMSCPB0to5vloZZmbIolw3G7TpZKv2fvkM TXEKYpexTAsrGm3ftgY/9ogYdddAi8OM3xOhRl6fJnCQJ4XhVaoQ9M4BVNnRsGMzFc33 9GKX1WuLIRkPAI1it3u0JjELP7MGDp4VB6IZoAZkgXhvuax7IQJ8IHyCLe5dhG67Vae7 2UaECEv3NXy4FBwGh/7P5fnVU+Ico5mRNXi8X97N5ddjJfBHoryvA7btvSj4EGJgLSZc cBKgoQur7XsAQ6ddB4jZqdrDv1hM/lahuwNQrNCo9e/m9WCnKtW6swIXFt8uLuIpU8Ye C92A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=CMpOe0BTU4zorq7uy2Xl9V8IEX0KfpTRENrguiofs0c=; b=RGkyxILSgZAYJM68G9leeCUSaYGAusdX7yEKM/o2f5k8Fkcuhn9VRhHIhFPX6gDBGr C6Xa2ulSf0zCiRe36BSiEJOTXfbm/CuzCCktdEcVW3RU4Udf1xQfMBYu4TF1c9GctUOs y5BxLSp9z5D7XDhmqnoIpIUJ6rT0M/AhbMieWEKMgUrH8/23413D7U/4TEi/ca8PkLAd AT1Iiyy/GPH9gBbnEFLoW2zjzqcBMRyswkUy4cjSK5WyhZLkLuqoZxP0neyCGzUwwCDe kJ+0iyyToMBGI2s0khd1QcbC8jUgjyld7v01SDX8UGz/OCnwF55ek9sAyVrVi+Cevb5t ANMw== X-Gm-Message-State: ALyK8tJe//oUyfLie+mnYMLUA3P0aX15Hzmrxh+qc1pM4R/rnywtVK6pkHkG6MnQzO1IAw== X-Received: by 10.194.119.233 with SMTP id kx9mr52516wjb.87.1466076322424; Thu, 16 Jun 2016 04:25:22 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id r16sm3297801wmb.23.2016.06.16.04.25.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jun 2016 04:25:21 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Phillip Lord References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> From: Dmitry Gutov Message-ID: <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> Date: Thu, 16 Jun 2016 14:25:19 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <87vb19zilb.fsf@russet.org.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/16/2016 10:41 AM, Phillip Lord wrote: > Well, it uses the directory that GIT_DIR points to (so > master/.git/worktrees/emacs-25 contains COMMIT_MSG, HEAD, index and so > on). > > Whether is uses GIT_DIR, who knows. I pressume that all git commands > obey GIT_DIR. Well, maybe it's used internally. It's of no concern to us here. > It's certainly true that it would nice to fix it elsewhere, but I am > unconvinced that setting the mode-line should ever result in an error as > a normal part of it's operation. It shouldn't. But it should let the user know that something's going wrong, so they can file a bug report. > Yep; I guess, we know exactly what vc-git--call does with git, and if it > never depends on GIT_DIR that should work. Although setting and > unsetting GIT_DIR seems a bit of a pain. How come? It'll be about as short as your current patch, if not shorter. > Personally, I prefer my first option of calling git consistently -- > always with CWD equal to root, and always with file paths relative to > the root. This way, GIT_DIR should not matter. Let's not be hasty about it. If new arguments arise in favor of this, we can do it, but so far unsetting GIT_DIR seems like the cheapest option. Like this: diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index f35c84d..4e495a5 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1450,7 +1450,9 @@ vc-git--call (or coding-system-for-read vc-git-log-output-coding-system)) (coding-system-for-write (or coding-system-for-write vc-git-commits-coding-system)) - (process-environment (cons "PAGER=" process-environment))) + (process-environment (cons + "GIT_DIR=" + (cons "PAGER=" process-environment)))) (apply 'process-file vc-git-program nil buffer nil command args))) (defun vc-git--out-ok (command &rest args) From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 12:07:04 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 16:07:05 +0000 Received: from localhost ([127.0.0.1]:43482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDZou-0007At-Ox for submit@debbugs.gnu.org; Thu, 16 Jun 2016 12:07:04 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:36407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDZot-0007AP-68 for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 12:07:03 -0400 Received: by mail-wm0-f48.google.com with SMTP id f126so57078504wma.1 for <23769@debbugs.gnu.org>; Thu, 16 Jun 2016 09:07:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=BFqrzJzUM5Av1waems5f5GAnNAozswM7nn7+9jxAROo=; b=p2Vszabo7ZjLH26gVWfGafSpQqVLWgIk/SxsodEwfwODkQpdRC2VOAVlwhuGMnJ5JE 8WYuAGGlw0QYLpHy1WG3FMU12JDCYrYCbznK8MJUNBua0mCrYnTYJ6i4e+Z1Up8HxenD 9TTjZepybPxQEkPhVAaA0ZC7R+QjOWwcQYKTtoZdQc7aLhJQyCkZIC5Rgz1fnWRie11/ 2TNOfG51aMGx2zDhIyLRT/rJynFPxjc229fgghRtxtJw8DZTuNl6rE3EFrKXye0fol35 f3637S3Rpu4h2LLm9Zs6FyUXFFL73T2Wak+AUSTnmEfhY/qgFHF0NfUKzZ7tXN3xTOby lB4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=BFqrzJzUM5Av1waems5f5GAnNAozswM7nn7+9jxAROo=; b=YKvCgyw8L7Qi706GQCwJN6ZnHis3pY8JVk7OK5wKEd0z+oTZpj8tiHAOBFR0j38AdR sH6HAe6ty0unkad83r69U3fJXv5IUpsHcfbvIiWUbrLnL7lBOBHga+POClTI0dhi37hB mrrEb6AuxTvuSOK5l/EjvFw4HcbLhtwpj/fqPeo9yCFW1h9MY5Z44J5UslpeWhaNJd85 90CZLEkPbMC2bgcAhs7mppsnSjLgxshiLmvzmp4VNBlSlZFDDaroYBbyMqiaRhhNlTq9 RuJmXDxXAyDUuxw5UYhbbahfFz2p9LvxAEEsz/Z8U9pl6H0pdAXzuK8m6pK+DT0wcJ/L N32Q== X-Gm-Message-State: ALyK8tIt0IYZoEfPyLJO/RO3DkCA/c4KnfghzZ+MxyCzH2h+fJ3OSnjLD/NoCDROECSIqQ== X-Received: by 10.194.114.228 with SMTP id jj4mr377777wjb.121.1466093217366; Thu, 16 Jun 2016 09:06:57 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id l4sm4071679wml.21.2016.06.16.09.06.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jun 2016 09:06:56 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Phillip Lord References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> From: Dmitry Gutov Message-ID: <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> Date: Thu, 16 Jun 2016 19:06:54 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/16/2016 02:25 PM, Dmitry Gutov wrote: > If new arguments arise in favor of this, we > can do it, but so far unsetting GIT_DIR seems like the cheapest option. > Like this: Actually, this is better. The previous one broke vc-git. :) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index f35c84d..2b827a3 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1451,6 +1451,7 @@ vc-git--call (coding-system-for-write (or coding-system-for-write vc-git-commits-coding-system)) (process-environment (cons "PAGER=" process-environment))) + (setenv "GIT_DIR" nil) (apply 'process-file vc-git-program nil buffer nil command args))) (defun vc-git--out-ok (command &rest args) From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 12:55:03 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 16:55:03 +0000 Received: from localhost ([127.0.0.1]:43500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDaZK-0001Xh-UH for submit@debbugs.gnu.org; Thu, 16 Jun 2016 12:55:03 -0400 Received: from mail-oi0-f44.google.com ([209.85.218.44]:33747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDaZI-0001X7-Gt for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 12:55:01 -0400 Received: by mail-oi0-f44.google.com with SMTP id u201so78834557oie.0 for <23769@debbugs.gnu.org>; Thu, 16 Jun 2016 09:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=uXluP11X9dNF14iHDZyqKVDPQKEfpZbYe5Nd2iRNII0=; b=c0dH5iuhZ3PUh+H1IC93KL+hyNhQkFDEw8nbbzlSOyxEejzmC1Yl3OVOQ9obby1T5H c2W+75aHUnhvA+CJbYZfb8KEyf8JdL3rOV1aoGlJ1iHrVYAg7dRid3y3M/RaPRLv2nwu zAycLwJL02edVq8SZyj1POER+AR47T+p0m6/p1ZzF+eWdZEsbKjfU4fY3g+XwDjnK2RQ UdQZxDoq9vOBcI/p6atgbrQHSkgx2bg/TW+DK8NvH0KJX38fFUfc0S6/2b32g9o/eBnw QL5c0Fz3i+KtQx8Noj9EwG3AW4dSfOcKGGs3bfW1UIZGtLFI4WMkhL+bV1E8DN/9ohKz doRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=uXluP11X9dNF14iHDZyqKVDPQKEfpZbYe5Nd2iRNII0=; b=ew58U7JiaWsEADB53RFNxGjwi1zcGOLe5ajv9LuaBswEJkOvpHT9KQ2uOkwLGFcEAV yVkkJnUGlsmnojXYCnNJT9qWQ88et3tcbZzqyieCJ1y2dx+OIguEymfnEB9oVRM/JOZQ RXDRIyBswtUIf4ergE+Q8J2nm4bugcjdF/RnX+KPKXKA+VsXvJgDtJS3xtHg54rEZVHP fpDx+k17FM/V78kuuuCigHzk8J072WKTpxSuKQPJqCjsI568euKIcq/T4Nl0io5HqQkG ojTEP4DUXdbFsvTotb24RA3hXwExeyNBbRv2xdwFWFlzbYDVzwNpCmRwdOFXtSFyGouP 94+w== X-Gm-Message-State: ALyK8tIcJQZDpyD7+ptX0bYRFYm5v1ZKxx7sqgVwR3gMYyIrWjMuObxzT4prmEvRA+jhX4kPbDeGGBSvfTZdQw== X-Received: by 10.157.38.185 with SMTP id l54mr557658otb.112.1466096094812; Thu, 16 Jun 2016 09:54:54 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.44.103 with HTTP; Thu, 16 Jun 2016 09:54:54 -0700 (PDT) In-Reply-To: <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> From: Noam Postavsky Date: Thu, 16 Jun 2016 12:54:54 -0400 X-Google-Sender-Auth: mII-lRtDBlYyb19FgRPIrBpFhuY Message-ID: Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Dmitry Gutov Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, Phillip Lord X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On Thu, Jun 16, 2016 at 12:06 PM, Dmitry Gutov wrote: > Actually, this is better. The previous one broke vc-git. :) > > diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el > index f35c84d..2b827a3 100644 > --- a/lisp/vc/vc-git.el > +++ b/lisp/vc/vc-git.el > @@ -1451,6 +1451,7 @@ vc-git--call > (coding-system-for-write > (or coding-system-for-write vc-git-commits-coding-system)) > (process-environment (cons "PAGER=" process-environment))) > + (setenv "GIT_DIR" nil) > I think you want (cons "GIT_DIR" ...) [without "="], using setenv can modify the process-environment list by side-effect. From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 12:59:13 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 16:59:13 +0000 Received: from localhost ([127.0.0.1]:43504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDadN-0001dK-EY for submit@debbugs.gnu.org; Thu, 16 Jun 2016 12:59:13 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:36604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDadL-0001d6-B3 for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 12:59:11 -0400 Received: by mail-wm0-f50.google.com with SMTP id f126so58820196wma.1 for <23769@debbugs.gnu.org>; Thu, 16 Jun 2016 09:59:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=tmM46cpg1ofdk/0VtIme9Juz0aGYv0J5AfE9nW19npI=; b=N6wsqkhVyZoUOlqkSxUdGwKZSqBtKuwdGRrqv4pVGI5fhR1OQtvA0GAfl95TtG2ZlT gUWRFd+xPnb1laSXqdSkTQoJnJ0CzucHuzLZovq2TkX/gC3LtYCWxtyBNjesVgcQgUuB RNkkd7E1dUgUagJwOXl/DP/QOMPxUJTwJlzIYTV4LsK2z6q7S1ma/Yig7340IMftGUXh kV3SyiZlzcj0TuPe20vvET/5b//CZ92oTwytIIpw/AzmUt6sKJQfcx4JGEvRTYm5HZcu k1ixGWFmE/ThNuQdIozCT+uhW15WBzOUw6AMYBE9PFvoMXvhGuvGg/Y2fcPjrao91xxC LGSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=tmM46cpg1ofdk/0VtIme9Juz0aGYv0J5AfE9nW19npI=; b=JJw0udVE1K6MEOOFQhlHoJgXQ98HPQ9MDKnP0ZG5plzHRaiTV7nE59Pv34e/OrEi2h jPKbXFZuOlWBR/zxhoufkObQB9wUVq6jARQ2pdPxwbX/9aQl8pMGnoBI8ws4dBItvi+I xdaSmj7f9cBgyVjnUsr7/ceJq73UKBQYIA/yFCbdnYwDOal+lHhtwtJbjHDWwEIiOumX qsYJ+RL5MPBZ02eKcw4kiVahhqVG+gEiMsHEmHVxPqo3CcxbzUUA4jLylgD5xuZeP6lg y3E7rCacOFX2wBUJhY+jvG0nccCLiUTYFDraW2UvZcRSim3HpamFld+rb/1sc0zE9Ztf hZQg== X-Gm-Message-State: ALyK8tK49VZDYVVlXXsrIFDur03GNPOS651iZHTsRti0ZqIcDzdcah9LzKTVIvYfYC/bpQ== X-Received: by 10.28.22.77 with SMTP id 74mr6250703wmw.36.1466096345533; Thu, 16 Jun 2016 09:59:05 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id q63sm728744wma.0.2016.06.16.09.59.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jun 2016 09:59:04 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Noam Postavsky References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> From: Dmitry Gutov Message-ID: Date: Thu, 16 Jun 2016 19:59:03 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, Phillip Lord X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/16/2016 07:54 PM, Noam Postavsky wrote: > I think you want (cons "GIT_DIR" ...) [without "="], using setenv can > modify the process-environment list by side-effect. You're probably right. From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 17:54:32 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 21:54:33 +0000 Received: from localhost ([127.0.0.1]:43566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfFA-0008So-OI for submit@debbugs.gnu.org; Thu, 16 Jun 2016 17:54:32 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:42912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfF9-0008ST-1p for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 17:54:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:References:Message-ID :Date:In-Reply-To:Subject:Cc:To:From; bh=3t8kzZUgSBcfEfXJDNuGjGVPf2rMB5/qXnGgQzUYWDE=; b=rVCnNyPjEiwmCuRKYjrh8WN0Rm iY+0P7TLn3+jI1pCfZXdldDqrIPPq8dmNA66ip3/YvYI04L6LC0Pjp5Jikv/MZ+gMMGG/zKqORkmv g4ytUmupfnqLjbP/KvGihDnUs0nXIxvruuPV7nUshuOK5ale02BoXEG/WkNUXUxyHIEKueBSYJIJg HKTsGZH1b3UpP0Im7NPnYBE6fQt18j33ml7iBP/fZOJVaQNSRiE2fv3zQVcz+8NIS5GouVc8hWcnQ Md09QCa5ip/+R//KgCVxJ2LHafqFOTpdRmVl+3d0Sj9Y2ghW1Y9CxGTA/E0nG5rHa1chH3+l1Fif7 /OdPEdZg==; Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:48863 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bDfF2-002JEl-To; Thu, 16 Jun 2016 22:54:25 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Dmitry Gutov Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git In-Reply-To: <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> (Dmitry Gutov's message of "Thu, 16 Jun 2016 19:06:54 +0300") Date: Thu, 16 Jun 2016 22:47:02 +0100 Message-ID: <87shwclsbt.fsf@russet.org.uk> References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Dmitry Gutov writes: > On 06/16/2016 02:25 PM, Dmitry Gutov wrote: >> If new arguments arise in favor of this, we >> can do it, but so far unsetting GIT_DIR seems like the cheapest option. >> Like this: > > Actually, this is better. The previous one broke vc-git. :) > > diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el > index f35c84d..2b827a3 100644 > --- a/lisp/vc/vc-git.el > +++ b/lisp/vc/vc-git.el > @@ -1451,6 +1451,7 @@ vc-git--call > (coding-system-for-write > (or coding-system-for-write vc-git-commits-coding-system)) > (process-environment (cons "PAGER=" process-environment))) > + (setenv "GIT_DIR" nil) > (apply 'process-file vc-git-program nil buffer nil command args))) > > (defun vc-git--out-ok (command &rest args) This just sets GIT_DIR nil globally right? It does appear to work, but is it not a bit blunt. Phil From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 17:54:33 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 21:54:33 +0000 Received: from localhost ([127.0.0.1]:43568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfFA-0008Sq-UP for submit@debbugs.gnu.org; Thu, 16 Jun 2016 17:54:33 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:42915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfF9-0008SW-IO for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 17:54:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:References:Message-ID :Date:In-Reply-To:Subject:Cc:To:From; bh=FrUvdwu8S84gWLp0dkcKFvlfxSCFjdNTxZZSpVijsnE=; b=kHaBQ30/YmBEC1fUWjTNyH0va5 +NuwLcDblf8LcMfmlmunK2DE3CfBlH0FYMEYfTBWnl3FfPK1ZYarDTOTAKKg33woZDqZ9Zbzw9g8v goCFOhjMGJsv2CPV7CKa+bCu+8KEa41xGNAXCj+KGiBoX9ICbnWBIfO9yKU/GYN/IJlC+jcLk2hgy 5DmzkkOga8JxlQwDf+KrkgmGJ0WH3MOIjMtOUtKsUJnkxyKs1UUw7xUXqqH+smoVAgJHM32acqG7E VDNSS+t0xby5Gr+RyGLEjxixvokzSDYneRSQe0VZtNGl6hzNo+zjwBGshGIwioukosQva3cHCTB7N cYe1M+Xg==; Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:48864 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bDfF3-002JEz-No; Thu, 16 Jun 2016 22:54:25 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Noam Postavsky Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git In-Reply-To: (Noam Postavsky's message of "Thu, 16 Jun 2016 12:54:54 -0400") Date: Thu, 16 Jun 2016 22:47:42 +0100 Message-ID: <87oa70lsap.fsf@russet.org.uk> References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, Dmitry Gutov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Noam Postavsky writes: > On Thu, Jun 16, 2016 at 12:06 PM, Dmitry Gutov wrote: >> Actually, this is better. The previous one broke vc-git. :) >> >> diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el >> index f35c84d..2b827a3 100644 >> --- a/lisp/vc/vc-git.el >> +++ b/lisp/vc/vc-git.el >> @@ -1451,6 +1451,7 @@ vc-git--call >> (coding-system-for-write >> (or coding-system-for-write vc-git-commits-coding-system)) >> (process-environment (cons "PAGER=" process-environment))) >> + (setenv "GIT_DIR" nil) >> > > I think you want (cons "GIT_DIR" ...) [without "="], using setenv can > modify the process-environment list by side-effect. Confused. Can you right a full patch? Phil From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 18:04:53 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 22:04:53 +0000 Received: from localhost ([127.0.0.1]:43574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfPA-0000Hq-TG for submit@debbugs.gnu.org; Thu, 16 Jun 2016 18:04:53 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:36544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfP9-0000Hd-It for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 18:04:51 -0400 Received: by mail-wm0-f43.google.com with SMTP id f126so67231528wma.1 for <23769@debbugs.gnu.org>; Thu, 16 Jun 2016 15:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=nfxrgAMIlxhjR+FbjnauQxyPRk+3hmO2rDYSWNrf220=; b=gGV4+dne4rRPq8abTe7Q1/1s1gB8QwstqB5j77s+OSBbawHzIN2gTiQQ+Au4+oY2QH R617CMBYyc5pyOVuQJgtp6GS6V1QfhjTnOKdHdNd4G1AQpmgy3nzh0eNuvZY+0ywK4uF lE0woV2iRacVMkbz6Sy0+HiLSZ0nXuBH1Ovbfj8Gf+3nbmpjBGZ4UvwLxUX05nAlV2lH XKO5GCMj/zD0dOgVhFhawZWbMD/o/oTHHCCZ0Z3v3zirl+nn9njR1CqTM4WJV154oz6B ZXj9e3xElhjgA3V8SvgFUIoFPoRhW0GHq6WIRPj02AffvfT1Q1Yj4p/h7cKPq4oD4l8i Ob4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=nfxrgAMIlxhjR+FbjnauQxyPRk+3hmO2rDYSWNrf220=; b=BoZixOyWq++VbpnEIDymNuACxz0GzwUFTjzW3Q3wlg7i5twXHQ2dKQStxv0LZU55zH C+t6edTXYi6WDQ4eougJYQsJ9949sPxHc1GM85uZ7wwia6Vgt9PEQF/WtMEAvbdkf2Fc e24iR6T/wjfACtUOjy3pVtu9ukwxRDKPmM/Nog8S51stebqkUUXuhoHLUTxrceIHwZ2P gl8e4vAh3n5Xywx+iJVPlcIx7MGmbUHkJbqtYTS6tg9a3iM5eVfqQ6f4IyrL6OBSUCcG SfYusirLuHTtWhPnC2ha21p1+Ice6+iTSbaHtJfAnY5hTvBYMWjcwiy7WUXrUy2iUKF7 u2FA== X-Gm-Message-State: ALyK8tLwRb0VSZDPFs/qwJCafpqGcpaD3p7hnDltDTfP28LovLeWBoamg0xLaX5Q8UsdyA== X-Received: by 10.28.25.69 with SMTP id 66mr6689003wmz.39.1466114686011; Thu, 16 Jun 2016 15:04:46 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id n66sm16826773wmn.7.2016.06.16.15.04.44 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 16 Jun 2016 15:04:45 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Phillip Lord References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87shwclsbt.fsf@russet.org.uk> From: Dmitry Gutov Message-ID: Date: Fri, 17 Jun 2016 01:04:43 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <87shwclsbt.fsf@russet.org.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/17/2016 12:47 AM, Phillip Lord wrote: > This just sets GIT_DIR nil globally right? It does appear to work, but > is it not a bit blunt. It would be a fine solution because we have a local binding for process-environment just a little bit above. But setenv changes it destructively, as Noam pointed out, so back to refining the other patch. From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 18:13:10 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 22:13:10 +0000 Received: from localhost ([127.0.0.1]:43579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfXB-0000UM-PN for submit@debbugs.gnu.org; Thu, 16 Jun 2016 18:13:09 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:35693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfX9-0000U9-Qy for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 18:13:08 -0400 Received: by mail-wm0-f44.google.com with SMTP id v199so208654423wmv.0 for <23769@debbugs.gnu.org>; Thu, 16 Jun 2016 15:13:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=MLGqyIiPavB0Z3VZ/aGYp6q6ZfP3+A4KenoCQUGZZyA=; b=pd/18VJMngtGA08wBXciDfz1ZveSTgne4QH7YLs40Rn/05JocEDN828/aIfbo0RGdE edDo7sUztWjm+fpQY64mvvAdzHX14D00npHobUc0b3rjwHGd5+a8tWUR8ijtDCiqrfeW 1X8zlBQfcsJQcNp4+cJQkWtLp7llNQ3DHDgbUjwibNd3SHaU32zMD+krrSnx4meMQl+c xYAoRj9SbgTDq7SkC2HmPFau0TcFnncQmOf7HOekfyTJIuzyvRMORkIw5hovE3hHRYmy wi5rVCBavVqUbsTYCQv1m/ZZuXVyxtONSpaj7ny041bPMb5n09sJGXOzAUn9y/5MxJs3 MqjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=MLGqyIiPavB0Z3VZ/aGYp6q6ZfP3+A4KenoCQUGZZyA=; b=QcF/F2zZcdqGr83joLc6mPBDV7YGLlAsGM+XyxQoVNSe2JlGRaNEbEaopde9xd4Cz7 Ejd54FB9Sjf6ewQSuVyQ3aWNDeyK+W75EofM3+YQHyncB2HzHcp1oQ7CtkRSBSDq2sl/ GN8HLLQZ9a7L9XCRuVheeqIQqadS7JtxzHPZlumJ4WMvKZBBhiGOy43axOxXvgwEv48e ME78W1Zzz30MZFvMY4IqTof6dduxqiwfHnEMVmJjAAv1s4mUzlls9dBWZW7BaExc+JdS qsJ5L41ZDyY1mdhr9v3Jn4e8DM7DK3M8k62Fa/s6YPRUpRQcI56stAcN10iatvqzmVm/ 4A9A== X-Gm-Message-State: ALyK8tLGCJbX6MUI9+ASpTPxnyGI20w5CrpDlQk1lf3KsVSzApk6t/qYluiuah+iAm+Tmg== X-Received: by 10.28.158.17 with SMTP id h17mr7342525wme.1.1466115182251; Thu, 16 Jun 2016 15:13:02 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id c4sm45750984wjm.24.2016.06.16.15.13.01 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 16 Jun 2016 15:13:01 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Phillip Lord , Noam Postavsky References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87oa70lsap.fsf@russet.org.uk> From: Dmitry Gutov Message-ID: <9f2cdad5-2ca8-0956-3f60-05cf30012e17@yandex.ru> Date: Fri, 17 Jun 2016 01:13:00 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <87oa70lsap.fsf@russet.org.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/17/2016 12:47 AM, Phillip Lord wrote: > Confused. Can you right a full patch? Here's a version: diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index f35c84d..74004d9 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1451,6 +1451,7 @@ vc-git--call (coding-system-for-write (or coding-system-for-write vc-git-commits-coding-system)) (process-environment (cons "PAGER=" process-environment))) + (push "GIT_DIR" process-environment) (apply 'process-file vc-git-program nil buffer nil command args))) (defun vc-git--out-ok (command &rest args) From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 18:24:02 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 22:24:02 +0000 Received: from localhost ([127.0.0.1]:43585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfhh-0000jl-RW for submit@debbugs.gnu.org; Thu, 16 Jun 2016 18:24:02 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:43830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfhf-0000jU-PE for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 18:24:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=IXDsqzrT2g7rpUfhdh88H6/+/20wFqBDMJg35Vx9ytg=; b=JxLyvlz9A94EpreAfaZA9478Ez kr+Wtfq1ZFZDlpIn1a/Ue0lCcgTnB4aTUtjmkZeIopLtXs1GnstB57CEa8YcCaRH6lpovjXht4AMn FVGdIQV8uYJDhnxnmWmw3vb/KdPANaXvWg6X7+Qth8DUUwbBkGqbJyKXuf2nktNFk7BBc1Rue/Fvg r/06Q0iZcq9fjEeubmP329aR5G3H56O8XM1oJARCvhHbGqq0mBZfa4iWeQZYCm8fZ6uVVFPkbEIZ2 xh+bHY2pQJJGlFPb0A5in85FSGcEsFBSzh4sJtw29LGApIyhhgm6FV2UPodmXi6vWrLDcIkWD8B2s 9v5uXjHA==; Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:48895 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bDfha-002OdK-42; Thu, 16 Jun 2016 23:23:54 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Dmitry Gutov Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87oa70lsap.fsf@russet.org.uk> <9f2cdad5-2ca8-0956-3f60-05cf30012e17@yandex.ru> Date: Thu, 16 Jun 2016 23:23:53 +0100 In-Reply-To: <9f2cdad5-2ca8-0956-3f60-05cf30012e17@yandex.ru> (Dmitry Gutov's message of "Fri, 17 Jun 2016 01:13:00 +0300") Message-ID: <87y464bwna.fsf@russet.org.uk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, Noam Postavsky X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Dmitry Gutov writes: > On 06/17/2016 12:47 AM, Phillip Lord wrote: > >> Confused. Can you right a full patch? > > Here's a version: > > diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el > index f35c84d..74004d9 100644 > --- a/lisp/vc/vc-git.el > +++ b/lisp/vc/vc-git.el > @@ -1451,6 +1451,7 @@ vc-git--call > (coding-system-for-write > (or coding-system-for-write vc-git-commits-coding-system)) > (process-environment (cons "PAGER=" process-environment))) > + (push "GIT_DIR" process-environment) > (apply 'process-file vc-git-program nil buffer nil command args))) > > (defun vc-git--out-ok (command &rest args) In my hands this needs to be "GIT_DIR=", at least for my tests to pass! From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 18:31:11 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 22:31:12 +0000 Received: from localhost ([127.0.0.1]:43592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfod-0000xv-MM for submit@debbugs.gnu.org; Thu, 16 Jun 2016 18:31:11 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:38073) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfoc-0000xi-RC for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 18:31:11 -0400 Received: by mail-wm0-f50.google.com with SMTP id m124so88524313wme.1 for <23769@debbugs.gnu.org>; Thu, 16 Jun 2016 15:31:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=0bZ99Nj5wuCxoD4M7DVHF7Q7VJcrAQctPReyKYfX1ck=; b=lwuGUD8Qn6AdulBWvTEpfZnvUUJ6FDEyUsiJigpBpJBchj/0cDkmrqzXZulHrG2xEG yT8ZKjoUaNTUnIPEHlxA8zTI8jsU37XgHpir5J/h5GRqhqfvArcR4lt2zLZJgRaBshxm dIWUfhi6F3lneyjo1FcgAvsAFTFOZoxvpokrZoAiTfoxGgNdKnnM0gAoS4dgNdY6mMi9 UsrQO//oAQnvDpj98nXE4vP4jL4kjf8/7SEh6/RxNp+3xXs6HAWpBGbiRbRORYwO7vQG pZjE/+h3+qqHtcKppjh6GfxpWMLK/TAHswkw0n07zIuCNO5qPveCZj3DpOW89VBdYFjS u1Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=0bZ99Nj5wuCxoD4M7DVHF7Q7VJcrAQctPReyKYfX1ck=; b=RaeJbCE+GAdLhYQwU2orCuAlNmIe4ttpC9fzoukjLVnofgzl2YI8VzBBkqiQWZ5cfR VJ8ie+yG+/Qc06na8aXXKlTLZZvU/MxeyErDQk/T4f1OeUyuU5tTict0TgFL+YolJNjg lZhiynxTyZfEB6fCLRN74fFCu9Ooz9XmqvCJZPQieZbW+qsCNMKUgSYvy7hzeJVt6Hae Olk+//l6uk7A9XPuHekqhe1s033YJuGXFnnPBkcQ0ZhdzhgsYSR8d44hGiU248b+i+ih +dq4icDbZ2t5OfVYgqk9Fw3Czv07pvj05udhpzoGxjeHOl1+1y6YE9d3TEja1p+mWZZ1 30wA== X-Gm-Message-State: ALyK8tKzEdAigVLF3AeXz6qEAWfjnGsz797PpB2wu0leba4J5y2CjTFftTEtsn9DmrK8AQ== X-Received: by 10.28.207.13 with SMTP id f13mr18251339wmg.53.1466116265187; Thu, 16 Jun 2016 15:31:05 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id bu7sm7629372wjc.42.2016.06.16.15.31.04 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 16 Jun 2016 15:31:04 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Phillip Lord References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87oa70lsap.fsf@russet.org.uk> <9f2cdad5-2ca8-0956-3f60-05cf30012e17@yandex.ru> <87y464bwna.fsf@russet.org.uk> From: Dmitry Gutov Message-ID: Date: Fri, 17 Jun 2016 01:31:03 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <87y464bwna.fsf@russet.org.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, Noam Postavsky X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/17/2016 01:23 AM, Phillip Lord wrote: > In my hands this needs to be "GIT_DIR=", at least for my tests to pass! "GIT_DIR=" turns the value into an empty string instead of nil. That breaks vc-git here in normal usage. From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 18:42:37 2016 Received: (at 23769) by debbugs.gnu.org; 16 Jun 2016 22:42:37 +0000 Received: from localhost ([127.0.0.1]:43599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfzg-0001Cu-Q1 for submit@debbugs.gnu.org; Thu, 16 Jun 2016 18:42:36 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:44391) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDfze-0001Cg-5r for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 18:42:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=smNjrQppToaqvZyxv4G0eQS43AKAZgGxN3zZqQtuq48=; b=JR80GXb18YTNJpQlzvWE2If8HZ 8P/dNGovym799jRnb46eebOnaUblWX9cPyqzBkuG8ZsinrbS0zMz0LhF/BkX+qHb+ThZNTx3id+sj DFznmeQ6ERi29XogB5xf2j/RJ0wN+ySb6SV8O09HiURyzNTWplq9uE16x8XjqbG5BLYaHw2mq6exG llN56N4yu9F+WJO04wyLbxRKgXF+PbJj/ZYGE5QqMBy6a+C8d2o9+cLbNtcz+U5oLwdC2IoNgJEEj kDT3GN7hwboZPgzod3Qp10ToXDs/6B2/PFNLwVnpKagI6hod2EfLlGmo3WOuBoGZhAIMOaaYJ88oO pOaJy9Kw==; Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:48930 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bDfzY-002Rtp-Eq; Thu, 16 Jun 2016 23:42:28 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Dmitry Gutov Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87oa70lsap.fsf@russet.org.uk> <9f2cdad5-2ca8-0956-3f60-05cf30012e17@yandex.ru> <87y464bwna.fsf@russet.org.uk> Date: Thu, 16 Jun 2016 23:42:27 +0100 In-Reply-To: (Dmitry Gutov's message of "Fri, 17 Jun 2016 01:31:03 +0300") Message-ID: <87twgsbvsc.fsf@russet.org.uk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, Noam Postavsky X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Dmitry Gutov writes: > On 06/17/2016 01:23 AM, Phillip Lord wrote: > >> In my hands this needs to be "GIT_DIR=", at least for my tests to pass! > > "GIT_DIR=" turns the value into an empty string instead of nil. That breaks > vc-git here in normal usage. A problem as "GIT_DIR" on it's own, still breaks with my originally reported error (at least when running my ert test I sent with my patch). Are you not getting this failure also? Phil From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 22:41:14 2016 Received: (at 23769) by debbugs.gnu.org; 17 Jun 2016 02:41:14 +0000 Received: from localhost ([127.0.0.1]:43647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDjic-0006v3-Ic for submit@debbugs.gnu.org; Thu, 16 Jun 2016 22:41:14 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:37732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDjia-0006uo-OO for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 22:41:13 -0400 Received: by mail-wm0-f43.google.com with SMTP id a66so81892170wme.0 for <23769@debbugs.gnu.org>; Thu, 16 Jun 2016 19:41:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=95CcipaoZenmSVV8WoW3QDYIgitOdd37uem7+ZwfOro=; b=tPvOCtd8vGxmPrmZSngt29ZKboRgkUF4bYRn2RkDsPYFfc5HfgXANyQjAXNxLw6uqG aN8k2G/gaGaXhd0FRHVn+toV4sx503mO3qo+vcLpUmracg8SvdfhxHU+Epc8uiftceAw x0CEmlZfEdaD2fOG2NgG98H8ReQBFdiqxdtTP/xNeNsrzCZIrcI3w0u91HSGCzFEr1Uu orsaFNYXN2JEcoYTg3OVL/HZ1uporxRs1+Ex4vtODgXesuI8em+aAKmfZByysjUpHH8C S2oXN42f6GxCmlpvlwIR/TbbVc/l3mTgZ12w9Wjr29gtR1GmtS6aGM+l8kKHIf+ZD1BU jDGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=95CcipaoZenmSVV8WoW3QDYIgitOdd37uem7+ZwfOro=; b=mjTgo65l2ARivTCgsfdVhXQTM/KlR/WawrupdBVEyWWZvXz/2xM3WCko+TItW467Qk 2POKnqixX9KQJqBIe9Uk9DYmMMhEfZ66Kzr8KWV+aLz6V55YznUDNuRxzwjrIinwqGCv RYXdgS/MsChAZCOhMdsNiSZFclV/VigWBKPhaFFxTHh5O30G7GJ6nHrBu9mMHVrdMn4n 6Zl2qkxfVWSpbXTONOT1cQSn0hEgJ7xZWs/vGwgXq0gT3GQAY7dFnCEe1UMlCVr8je4c XTg9kjuL19OolPsnaEDElsDKUWLZWFqyq2erqywUwu5nq9hRI6IUvs76TyxP+tuX/a0q S3Qw== X-Gm-Message-State: ALyK8tIZLTw51ezoLrpSJGykXe/uImI/UNNsjtb+yJJjHDFL41wy4NHKwrQFJxdh9EvirQ== X-Received: by 10.28.150.81 with SMTP id y78mr17603278wmd.37.1466131267079; Thu, 16 Jun 2016 19:41:07 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id e8sm17628214wma.2.2016.06.16.19.41.05 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 16 Jun 2016 19:41:06 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Phillip Lord References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87oa70lsap.fsf@russet.org.uk> <9f2cdad5-2ca8-0956-3f60-05cf30012e17@yandex.ru> <87y464bwna.fsf@russet.org.uk> <87twgsbvsc.fsf@russet.org.uk> From: Dmitry Gutov Message-ID: <55d7d4f1-321c-96a2-63da-8759bebffb89@yandex.ru> Date: Fri, 17 Jun 2016 05:41:04 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <87twgsbvsc.fsf@russet.org.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, Noam Postavsky X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/17/2016 01:42 AM, Phillip Lord wrote: > A problem as "GIT_DIR" on it's own, still breaks with my originally > reported error (at least when running my ert test I sent with my patch). > > Are you not getting this failure also? Sorry, I was only testing that the addition doesn't break anything in the normal case, otherwise relying on process-environment's docstring. There was a problem with the patch that not all vc-git code goes through vc-git--call (in fact, most don't), but even patching vc-git-command in a similar fashion doesn't change the behavior if Emacs was started with GIT_DIR=.git. Could this feature be actually broken? Or how does Git ignore the modification? "To use ‘process-environment’ to remove an environment variable, include only its name in the list, without "=VALUE"." diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index f35c84d..a544a2e 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1423,7 +1423,9 @@ vc-git-command (let ((coding-system-for-read (or coding-system-for-read vc-git-log-output-coding-system)) (coding-system-for-write - (or coding-system-for-write vc-git-commits-coding-system))) + (or coding-system-for-write vc-git-commits-coding-system)) + (process-environment process-environment)) + (push "GIT_DIR" process-environment) (apply 'vc-do-command (or buffer "*vc*") okstatus vc-git-program ;; http://debbugs.gnu.org/16897 (unless (and (not (cdr-safe file-or-list)) @@ -1451,6 +1453,7 @@ vc-git--call (coding-system-for-write (or coding-system-for-write vc-git-commits-coding-system)) (process-environment (cons "PAGER=" process-environment))) + (push "GIT_DIR" process-environment) (apply 'process-file vc-git-program nil buffer nil command args))) (defun vc-git--out-ok (command &rest args) From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 16 23:37:15 2016 Received: (at 23769) by debbugs.gnu.org; 17 Jun 2016 03:37:15 +0000 Received: from localhost ([127.0.0.1]:43681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDkao-0008FS-Rs for submit@debbugs.gnu.org; Thu, 16 Jun 2016 23:37:15 -0400 Received: from mail-oi0-f51.google.com ([209.85.218.51]:35709) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDkan-0008FE-6U for 23769@debbugs.gnu.org; Thu, 16 Jun 2016 23:37:13 -0400 Received: by mail-oi0-f51.google.com with SMTP id w5so99591640oib.2 for <23769@debbugs.gnu.org>; Thu, 16 Jun 2016 20:37:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=rUv87CR/Vrd5gTsufGdJtAUyN+9aMEqyr9DY481CLKo=; b=GSRY8kLlMqxb1l7W2RnPS3c7Y2JKYJs9ZBVLRoD2zOtxaO+CdObFeSFEv3g2IJc/Ah 3YE8H3QuYdZ6YgKMBX50CpRSmM08+Obd0X3/xR8DU9OAyi/ObB1M6zP4u3ocknK0ulRl zQvb5Jqa4CGKS+Shk0+KswMF42N1ufGpUxqTUDb5VHmqKNNhmneoatlgpIOhCHr+WWQD Pu4ceTWUCwf9GdAH7ar4H/Yc9ATGwtcRIc1HJFTJCbHOd1ED7yvQPyb77xdPOpT/lPKn TAkLsGv/UNH5b6velfzUohw/WlyDf+eZtiE8onlssxGwVFVYBGgy6n+IKhZeFxbsdcXo 6K3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-transfer-encoding; bh=rUv87CR/Vrd5gTsufGdJtAUyN+9aMEqyr9DY481CLKo=; b=TPZ9MPotdQgOnlhQy0LlDhnKNCbA7Zi8kuu+TtWKCIsN8FzD33R9OcWGdwDYyEUFue lgTyCRc0NsiYZNy3RsK6yUchJBcjPfGDaggeTg3Q/WW3EqaDZA3z5m2I0uIErbH58el2 4Ey2uYu6e36ebxtNME8A3H5W8og1kpeFoKs2YlL3CSkA5KtDf0+j+8EhbQKeNFuxDGnk eBIFcnNpTzlsuyKNaZvW88CRGMoGDgCIjkLQeuR9LwjfgEFOhx0pWvvE7LpuJfEwY8VD QM53yy2QCGN7/2gGs5erUWpWmye8mGjpkcvp9+twiBi3qp2SNp51uoONYB5DmpHT2Ut6 c80w== X-Gm-Message-State: ALyK8tIY4bu31cbiaBliR5yFX22k5q5vpHYJUGX8g7rBh9qNnfDMgINFfydTGnpjg8/YIXshkWfiFfEA8qONbg== X-Received: by 10.157.38.185 with SMTP id l54mr251717otb.112.1466134627525; Thu, 16 Jun 2016 20:37:07 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.44.103 with HTTP; Thu, 16 Jun 2016 20:37:06 -0700 (PDT) In-Reply-To: <55d7d4f1-321c-96a2-63da-8759bebffb89@yandex.ru> References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87oa70lsap.fsf@russet.org.uk> <9f2cdad5-2ca8-0956-3f60-05cf30012e17@yandex.ru> <87y464bwna.fsf@russet.org.uk> <87twgsbvsc.fsf@russet.org.uk> <55d7d4f1-321c-96a2-63da-8759bebffb89@yandex.ru> From: Noam Postavsky Date: Thu, 16 Jun 2016 23:37:06 -0400 X-Google-Sender-Auth: E1jPHnZvmH_H2doJQrPPzzsussk Message-ID: Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Dmitry Gutov Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, Phillip Lord X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On Thu, Jun 16, 2016 at 10:41 PM, Dmitry Gutov wrote: > Could this feature be actually broken? Or how does Git ignore the > modification? > > "To use =E2=80=98process-environment=E2=80=99 to > remove an environment variable, include only its name in the list, > without "=3DVALUE"." Turns out this feature is broken, see http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D23779 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 17 02:54:55 2016 Received: (at 23769) by debbugs.gnu.org; 17 Jun 2016 06:54:55 +0000 Received: from localhost ([127.0.0.1]:43787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDng7-0002iB-Ah for submit@debbugs.gnu.org; Fri, 17 Jun 2016 02:54:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDng4-0002hv-BY for 23769@debbugs.gnu.org; Fri, 17 Jun 2016 02:54:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDnfv-00042f-T7 for 23769@debbugs.gnu.org; Fri, 17 Jun 2016 02:54:47 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60102) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDnfC-0003sG-Th; Fri, 17 Jun 2016 02:53:58 -0400 Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4153 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1bDnfA-0005ii-7k; Fri, 17 Jun 2016 02:53:56 -0400 Date: Fri, 17 Jun 2016 09:54:57 +0300 Message-Id: <83bn30cnjy.fsf@gnu.org> From: Eli Zaretskii To: Noam Postavsky In-reply-to: (message from Noam Postavsky on Thu, 16 Jun 2016 23:37:06 -0400) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87oa70lsap.fsf@russet.org.uk> <9f2cdad5-2ca8-0956-3f60-05cf30012e17@yandex.ru> <87y464bwna.fsf@russet.org.uk> <87twgsbvsc.fsf@russet.org.uk> <55d7d4f1-321c-96a2-63da-8759bebffb89@yandex.ru> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -6.4 (------) X-Debbugs-Envelope-To: 23769 Cc: phillip.lord@russet.org.uk, 23769@debbugs.gnu.org, dgutov@yandex.ru X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Eli Zaretskii Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.4 (------) > From: Noam Postavsky > Date: Thu, 16 Jun 2016 23:37:06 -0400 > Cc: 23769@debbugs.gnu.org, Phillip Lord > > On Thu, Jun 16, 2016 at 10:41 PM, Dmitry Gutov wrote: > > Could this feature be actually broken? Or how does Git ignore the > > modification? > > > > "To use ‘process-environment’ to > > remove an environment variable, include only its name in the list, > > without "=VALUE"." > > Turns out this feature is broken, see > http://debbugs.gnu.org/cgi/bugreport.cgi?bug=23779 (setenv "FOO") works for me. From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 17 08:06:20 2016 Received: (at 23769) by debbugs.gnu.org; 17 Jun 2016 12:06:20 +0000 Received: from localhost ([127.0.0.1]:43876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDsXU-0003IU-9y for submit@debbugs.gnu.org; Fri, 17 Jun 2016 08:06:20 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:36402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDsXS-0003IF-QC for 23769@debbugs.gnu.org; Fri, 17 Jun 2016 08:06:19 -0400 Received: by mail-wm0-f48.google.com with SMTP id f126so86361999wma.1 for <23769@debbugs.gnu.org>; Fri, 17 Jun 2016 05:06:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=TE/AmD12QButHo/25waSapVTvSADXARRS443P+G5CQ0=; b=IOk8uavjnCoqEPZvyVG/GnHcQ0kBjwLX78c3JbFB3M3vpHtNo+HJLdAcmD/o3ypN56 CV7g02Mg8Ev37IPX6WGufUXgq8u3aU2fS5tcaQNgts0NxaLMkfYYehIVgH5YAP7VlWEq pVoSvxt979qijVsD7ZPcFocUkoz+bXdqVJKQJMRQ/tXqlkieVIRtUkKgpSLPe0CF1/7E DdDqEpOsAKt92jmaC1Gyr/TvXhKcwe6tMKDYl9uQO9tHTw+zRGIXOV8s6OMLLXaiiMzb IVOujaEinmvC1NT1y1P4HkM0zy+4kXiti2SPBFfUIqGNvBdxdHMPp1FUmc460BGdmFka OUuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=TE/AmD12QButHo/25waSapVTvSADXARRS443P+G5CQ0=; b=Ahhp78/2EHkY0d/WdYNAt9d0BS8UPCO9Ita1alGkW8WIp7Df9iVv2jrhPsiKVMY1hK 8W0kRxMMHjtue51RZA4gis4B7SHbCSD5GgdLFGVFf8GtmosnzMe+cfmCP0X47G9SNxAI mLe6ESIdMoLGu6F1Md8Mhguau67wg3+HfjaziAVylXw5Y4PGmbUqKTjEhPqPKF65DByG EEGU87i3C1izVMRt5Kq7Q0CPuMa30Ht9zWG2wVFbgkj+619WtzAiKMNOO1UNuw6TTFy1 ILwaVg9SZp2ZskjEJ/rRcqvWruyyEX2tstCskVui3rFRWmlljRHB2+aLEZepiIcWGs2g 4hEg== X-Gm-Message-State: ALyK8tJKmNYfBgs3vRQZsK6v54LLkfojYY9qpX8Y8UXFNy3CTHmOu51et3tcc98Q9ans1g== X-Received: by 10.28.176.7 with SMTP id z7mr1949924wme.17.1466165173140; Fri, 17 Jun 2016 05:06:13 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id o10sm48478734wjz.37.2016.06.17.05.06.11 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 17 Jun 2016 05:06:12 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Eli Zaretskii , Noam Postavsky References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87oa70lsap.fsf@russet.org.uk> <9f2cdad5-2ca8-0956-3f60-05cf30012e17@yandex.ru> <87y464bwna.fsf@russet.org.uk> <87twgsbvsc.fsf@russet.org.uk> <55d7d4f1-321c-96a2-63da-8759bebffb89@yandex.ru> <83bn30cnjy.fsf@gnu.org> From: Dmitry Gutov Message-ID: Date: Fri, 17 Jun 2016 15:06:10 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <83bn30cnjy.fsf@gnu.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org, phillip.lord@russet.org.uk X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/17/2016 09:54 AM, Eli Zaretskii wrote: > (setenv "FOO") works for me. setenv works destructively. To use it and remain good citizens, we'd have to `(copy-sequence process-environment)` every time we call a Git command. Maybe that's not huge in the grand scheme of things, but it certainly looks wasteful. From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 17 09:21:17 2016 Received: (at 23769) by debbugs.gnu.org; 17 Jun 2016 13:21:17 +0000 Received: from localhost ([127.0.0.1]:43904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDti0-00051S-OU for submit@debbugs.gnu.org; Fri, 17 Jun 2016 09:21:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDthy-00051F-Vs for 23769@debbugs.gnu.org; Fri, 17 Jun 2016 09:21:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDthp-000462-DB for 23769@debbugs.gnu.org; Fri, 17 Jun 2016 09:21:09 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37466) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDth5-0003tt-Du; Fri, 17 Jun 2016 09:20:19 -0400 Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4427 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1bDth3-0000tp-9X; Fri, 17 Jun 2016 09:20:17 -0400 Date: Fri, 17 Jun 2016 16:21:16 +0300 Message-Id: <83ziqkar3n.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-reply-to: (message from Dmitry Gutov on Fri, 17 Jun 2016 15:06:10 +0300) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87oa70lsap.fsf@russet.org.uk> <9f2cdad5-2ca8-0956-3f60-05cf30012e17@yandex.ru> <87y464bwna.fsf@russet.org.uk> <87twgsbvsc.fsf@russet.org.uk> <55d7d4f1-321c-96a2-63da-8759bebffb89@yandex.ru> <83bn30cnjy.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -6.4 (------) X-Debbugs-Envelope-To: 23769 Cc: phillip.lord@russet.org.uk, 23769@debbugs.gnu.org, npostavs@users.sourceforge.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Eli Zaretskii Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.4 (------) > Cc: 23769@debbugs.gnu.org, phillip.lord@russet.org.uk > From: Dmitry Gutov > Date: Fri, 17 Jun 2016 15:06:10 +0300 > > On 06/17/2016 09:54 AM, Eli Zaretskii wrote: > > > (setenv "FOO") works for me. > > setenv works destructively. To use it and remain good citizens, we'd > have to `(copy-sequence process-environment)` every time we call a Git > command. > > Maybe that's not huge in the grand scheme of things, but it certainly > looks wasteful. If you want to manually remove the variable before adding it with no value, that will also work. Otherwise, I see no magic that would do anything beyond the expected effect on any list. From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 17 09:54:48 2016 Received: (at 23769) by debbugs.gnu.org; 17 Jun 2016 13:54:48 +0000 Received: from localhost ([127.0.0.1]:43918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDuES-0005ox-Ar for submit@debbugs.gnu.org; Fri, 17 Jun 2016 09:54:48 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:37614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDuEQ-0005ok-UI for 23769@debbugs.gnu.org; Fri, 17 Jun 2016 09:54:47 -0400 Received: by mail-wm0-f51.google.com with SMTP id a66so767079wme.0 for <23769@debbugs.gnu.org>; Fri, 17 Jun 2016 06:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=Da9tznnphA834p9YBnqKapr76ph37nFmAFWrY8yE+js=; b=wL9kqYnidB+cvIqsNg1FztxGv678+CJ3O18FnBVP8WhKeANjQ42QyBv2kPpFw2SWI/ zZ8y0Vyn+krDCXh2Tp+1N2F+LR1l0L/DzJRXbIwLdqCTuMfTOcyoXr6P4vA7SSVmLjOh MvshvDz3ym9tBymy6NSJbdvs0gyi8hb3h9OgDbvFz9JNtXAWEDGpPAfCgt0KJvErhhzR fwLEJ5CSXq8Rd0GbPon1Wn5jTJJh2t5dM0ERG2LRJbW37JPLNz9jVGb7zNImTq/ENYQF UE2Drkx2jshgj496vUhepD3ICy7IZoO+niB2JJzv+/hbcFGFMj4uv0IQWO/phVt+BsaZ VuQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=Da9tznnphA834p9YBnqKapr76ph37nFmAFWrY8yE+js=; b=QUILmsPBdxpIyTXvQUgjZtTZ26QqiArXtSnRKndYbjvlL/GIPVBtkAa9KLvvgt3qsN gdM7ydSL60ZxdSDhH7FimjpjQUHIz2uijUOopDjNJeaJGzdLdjXWWQ3TAn6b0qeVd1JD bh3PmfI3Fhq4J+2gbTkSe3hmqTEuSzXn0V2Vx9ii9IaR/3IlVfvM//kNurccrgtGf96V gpqQrti5r62pbakMUnPQKhy35wDoeBZN3iUE5j0RDjWl+SPvK2Xwlm3SRt8WOtAPbP4N E3HWXNs6eRQ/XAauvJhYKltwiu7NK9bltTmemPBdY9YNgfKR0ol+AOdHPEswKwZ8virQ 0Ddg== X-Gm-Message-State: ALyK8tI0vdvlxF3wOkGkknqQmUdkQW8ZCPnfo/+cAInWozX0qHxgFCek/tY5JsCDf3cXoQ== X-Received: by 10.28.87.208 with SMTP id l199mr22461094wmb.1.1466171681270; Fri, 17 Jun 2016 06:54:41 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id s123sm13908893wmb.15.2016.06.17.06.54.39 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 17 Jun 2016 06:54:40 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Eli Zaretskii References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87oa70lsap.fsf@russet.org.uk> <9f2cdad5-2ca8-0956-3f60-05cf30012e17@yandex.ru> <87y464bwna.fsf@russet.org.uk> <87twgsbvsc.fsf@russet.org.uk> <55d7d4f1-321c-96a2-63da-8759bebffb89@yandex.ru> <83bn30cnjy.fsf@gnu.org> <83ziqkar3n.fsf@gnu.org> From: Dmitry Gutov Message-ID: <36eb4576-49c3-f9b2-fc80-5c5c90c8ab9f@yandex.ru> Date: Fri, 17 Jun 2016 16:54:38 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <83ziqkar3n.fsf@gnu.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 23769 Cc: phillip.lord@russet.org.uk, 23769@debbugs.gnu.org, npostavs@users.sourceforge.net X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 06/17/2016 04:21 PM, Eli Zaretskii wrote: > If you want to manually remove the variable before adding it with no > value, that will also work. That would also be destructive. > Otherwise, I see no magic that would do > anything beyond the expected effect on any list. process-environment just needs to be fixed. From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 17 11:10:03 2016 Received: (at 23769) by debbugs.gnu.org; 17 Jun 2016 15:10:03 +0000 Received: from localhost ([127.0.0.1]:44413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDvPG-0007lL-PL for submit@debbugs.gnu.org; Fri, 17 Jun 2016 11:10:03 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:60556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDvPE-0007kq-HI for 23769@debbugs.gnu.org; Fri, 17 Jun 2016 11:10:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=Ruedz1qMFDiOjK8zw9iiLVZEay/POwdK/n7+7QSkxIU=; b=WeXb+VqhUH/WXaA1BDYqGp6yft zhc+9FroVoLtyV7h9vwVTXdSnoY0j1HgOATPlT+n1XE3nSRngb5+NJjQy1RS8DNGQfc4xBotjq8wN bmSRX0RjyGnjX8xBEsw4gD33305ta6KqBGUoJJdCOeLDoiIcLZ0j0O4jX1JqICilUfBRjlpb3z2Qx MMu3aLTkBNa2pd84T0XamsH+n/Kfbvo94DCPcqLcqA9K0khPIE+q36U5m07F0Z8TUs/1PB7fZPbJB us1P6bqZGPDEuNO7t1blLFOBL+Huo31pMghqQtwW/DCYcO1HgnUWodCSoR/82x7Y5tBmZ+yHstm0d azG49vPA==; Received: from janus-nat-128-240-225-60.ncl.ac.uk ([128.240.225.60]:32362 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bDvP8-000Zgh-Fa; Fri, 17 Jun 2016 16:09:54 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Dmitry Gutov Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87oa70lsap.fsf@russet.org.uk> <9f2cdad5-2ca8-0956-3f60-05cf30012e17@yandex.ru> <87y464bwna.fsf@russet.org.uk> <87twgsbvsc.fsf@russet.org.uk> <55d7d4f1-321c-96a2-63da-8759bebffb89@yandex.ru> <83bn30cnjy.fsf@gnu.org> Date: Fri, 17 Jun 2016 16:09:53 +0100 In-Reply-To: (Dmitry Gutov's message of "Fri, 17 Jun 2016 15:06:10 +0300") Message-ID: <87d1nf26ny.fsf@russet.org.uk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: Eli Zaretskii , 23769@debbugs.gnu.org, Noam Postavsky X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Dmitry Gutov writes: > On 06/17/2016 09:54 AM, Eli Zaretskii wrote: > >> (setenv "FOO") works for me. > > setenv works destructively. To use it and remain good citizens, we'd have to > `(copy-sequence process-environment)` every time we call a Git command. > > Maybe that's not huge in the grand scheme of things, but it certainly looks > wasteful. I used this in my tests.... (let ((foo (getenv "FOO"))) (unwind-protect (progn (setenv "FOO") (apply 'git-program args)) (setenv "FOO" foo))) It's why I that setting and unsetting GIT_DIR seemed a bit of a pain earlier. It should work though. Phil From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 21 12:46:36 2016 Received: (at 23769) by debbugs.gnu.org; 21 Jun 2016 16:46:36 +0000 Received: from localhost ([127.0.0.1]:50006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFOou-0000KP-1m for submit@debbugs.gnu.org; Tue, 21 Jun 2016 12:46:36 -0400 Received: from mail-lb0-f175.google.com ([209.85.217.175]:36446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFOos-0000KA-Ig for 23769@debbugs.gnu.org; Tue, 21 Jun 2016 12:46:34 -0400 Received: by mail-lb0-f175.google.com with SMTP id ak10so14840985lbc.3 for <23769@debbugs.gnu.org>; Tue, 21 Jun 2016 09:46:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=NAi1cC++1lVvnxlWjme3Oq/EEPOqRS2mf7DzlNHoFpI=; b=no4vWwpJ+xN7vjaYj/19bXwGvGLMms9yb66cUelvM0jYTOOg682JdXueQxHepq9HXn 9EhdW17Ar4A7PrydHLQoyv4lQPUDpyDImmxSmdUiY4nZdcgBhRmqID1TA8WmgCQVVuoy ZUBvL0VUM+mdyXCvK0BCG3HSxd5pR5jeTBUh2KoNpO5a3ZDDyDmzPN6MY7TFBQtXG5SY IaJh3bXBW3fMKEsOFFqeGGEok3Pj0oqe2P5PG92J91ZeHf24yiaBciOS4YkbtnJo73sx F9ggJRCXl3s/Qj1Crp/z8CvVBHLC045eFqXaJb0wKuAR9hlGkzFr0WKcFxJngi73YM51 UH2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=NAi1cC++1lVvnxlWjme3Oq/EEPOqRS2mf7DzlNHoFpI=; b=PKcbr6zecnozcHbh8iChvJO2bPrrq3Dr1vxULpLqC53dAF6kY+YnsvHva81JRUz1L3 7dH5iQIIjkboFF3645Qbjj8ALCWsdkaef2GE9C+TaBu1D4M6+lu+JvxonZzywPXWUrlq 2PG5AUnI/xU8UuXFzvWARDimTkMCveQiXtaL9OaMXD55/AILugxsTreG+5l9CTxzkcdX CC9OSrhtc6FnntzpmMH48L93AIgcHI49SGJd22fepaOGIvRv0GPMfHQ9EqPfyzv0jD5R 1qxbsEGJD962QYzRZkdh1ilmk0G0ndGQsF6jOvwGyyPEHkgIWgJ9OQHIB5l0FDssvEbZ XPKQ== X-Gm-Message-State: ALyK8tLSq/SeoW2quZx2SORphRyNE1roHoGCleXYtsCQRuaW17vdlcazw+OL2KAOr+dNWg== X-Received: by 10.194.141.131 with SMTP id ro3mr4404214wjb.51.1466527588664; Tue, 21 Jun 2016 09:46:28 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id u71sm3760857wmu.13.2016.06.21.09.46.27 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Jun 2016 09:46:28 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Phillip Lord References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87shwclsbt.fsf@russet.org.uk> From: Dmitry Gutov Message-ID: <22eef879-5dd3-894c-ac72-d831421b96be@yandex.ru> Date: Tue, 21 Jun 2016 19:46:26 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Hi Philip, Could you please pull the latest changes from emacs-25, rebuild, and check that applying the patch from http://debbugs.gnu.org/cgi/bugreport.cgi?bug=23769#86 fixes this problem? From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 21 16:45:53 2016 Received: (at 23769) by debbugs.gnu.org; 21 Jun 2016 20:45:53 +0000 Received: from localhost ([127.0.0.1]:50074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFSYT-0005zy-CN for submit@debbugs.gnu.org; Tue, 21 Jun 2016 16:45:53 -0400 Received: from cloud103.planethippo.com ([31.216.48.48]:41072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFSYR-0005zk-Gx for 23769@debbugs.gnu.org; Tue, 21 Jun 2016 16:45:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From; bh=+TZuPikSL/MftsGm1HR2hx/GrjqGkvwDDM21Fj4sJgQ=; b=mFB0QvCl6LJe9BiEpGm9QxF/tn eShK1Vb46URF8KqiQCdbPQKa73/Wm7pfq3aEBdNzT5b7Dd4My6/naUw+ZdGq0dwuy19ugcSEPZK+8 MeV77vyMzDgVcZs/5cENkVlNMarZbJ9jEEKkVx4eys0OswB/gK4KIRAcpKStHwDJMrbRnwPrFP3Td cWBoe5ZxVHo0aHp/f2MMmBUKXP8VB36mCvT6m05I5mXzjsGo3TydA6LSJXibWDgNSSOL6dPByfjhe wnQkmJQhldwKtQjPusJuh7FgoRiINEdKGIXTgDcTKEel49X4HLiYrYI7ET8e9cfo7KbDHp9zYzmmy +gwzDxLg==; Received: from cpc1-benw10-2-0-cust373.gate.cable.virginm.net ([77.98.219.118]:36147 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.86_1) (envelope-from ) id 1bFSYL-003YR1-H4; Tue, 21 Jun 2016 21:45:45 +0100 From: phillip.lord@russet.org.uk (Phillip Lord) To: Dmitry Gutov Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87shwclsbt.fsf@russet.org.uk> <22eef879-5dd3-894c-ac72-d831421b96be@yandex.ru> Date: Tue, 21 Jun 2016 21:45:45 +0100 In-Reply-To: <22eef879-5dd3-894c-ac72-d831421b96be@yandex.ru> (Dmitry Gutov's message of "Tue, 21 Jun 2016 19:46:26 +0300") Message-ID: <87ziqefeyu.fsf@russet.org.uk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 23769 Cc: 23769@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) Dmitry Gutov writes: > Hi Philip, It's "Phillip" actually, but "Phil" is easier. > > Could you please pull the latest changes from emacs-25, rebuild, and > check that applying the patch from > http://debbugs.gnu.org/cgi/bugreport.cgi?bug=23769#86 fixes this > problem? Yes, this appears to work on the emacs-25 head. Are you going to add the test case that I sent in also? If not, I'll just add it to master (I don't think it will merge cleanly, so this might be the best solution anyway). Phil From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 21 19:07:03 2016 Received: (at 23769-done) by debbugs.gnu.org; 21 Jun 2016 23:07:03 +0000 Received: from localhost ([127.0.0.1]:50151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFUl5-0002U6-Dp for submit@debbugs.gnu.org; Tue, 21 Jun 2016 19:07:03 -0400 Received: from mail-lf0-f43.google.com ([209.85.215.43]:35476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFUl3-0002Td-Hl for 23769-done@debbugs.gnu.org; Tue, 21 Jun 2016 19:07:01 -0400 Received: by mail-lf0-f43.google.com with SMTP id l188so47375864lfe.2 for <23769-done@debbugs.gnu.org>; Tue, 21 Jun 2016 16:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=zrD1A8t80G6BiKNC/awm5ONBHLDNxNCWi79zcsjIkOo=; b=a3TogIsQYDLVa/ucmEbD+W2IoUcKmUMzV12x1HSVz51GUEI3BjOKekQYj3HH9OuSYp 2sxiX9fvdE66EUck3Soi6NnLTK9CbkZyQgsOgmp+7koQxbJgSKKW/4z5BXlVwAueWuFi r7jkG3GcKPwU5Vu4gsyr97wse7lQ88GudMZOvgxnLgUkCwFiQ9knWQZQSyupvY3WSyMO D4FiCywvMgZn8nuSkfIlfYZED6giSOPfSzqysMbIL+fvY1AtDn5e3b5U/pN+Wb8IAINR L6OgKxh59KGMeTMzTQ/BZupwPay1qB3KznTXeBT3UlEnOsJ2gdy9aIWzeJrLU/++DWQu GocQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=zrD1A8t80G6BiKNC/awm5ONBHLDNxNCWi79zcsjIkOo=; b=l4P+y3DQN3pIrpgEIWUGa4BCgGQJKPU+r4ptah2w1WmwwdZOdsdCBi8EfaX0XZUd7A BKrs9Uf8hiX4oR/QOaLvjgrfy2HtlTJqzwfNT8fzaHogtSTHkcEArwcPw96CklptN6AS 72ImYK90xpNY5zs36g9cgCaFoBvEeB1aGIGDoGfTitB/ugbvmvJBYYMteOcwiuY9V6Ml QFf0hCsTQrQr6DQ29BCejNL5QVHSQdQucUOXxarly2JggjKbSaD1R0lWofEdlrqa9PA7 7iGKOSJPKub5HaaT+5x+1hUdIzP6B4WFAtxkuVQt6LN9jz6C5hpLe1vVKmGva78+k3Wv KZFQ== X-Gm-Message-State: ALyK8tKAJDi959b6y2dqba9wuUQQVULgTZvKnAldcI/2QnB6yj3e/gAXmvRfv1gD6jj9vw== X-Received: by 10.194.88.106 with SMTP id bf10mr16698397wjb.37.1466550415699; Tue, 21 Jun 2016 16:06:55 -0700 (PDT) Received: from [192.168.1.2] ([185.105.173.135]) by smtp.googlemail.com with ESMTPSA id x194sm5042304wmf.13.2016.06.21.16.06.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2016 16:06:55 -0700 (PDT) Subject: Re: bug#23769: 25.0.95; Mode Line breakage in vc-git To: Phillip Lord References: <87a8ioyq9o.fsf@russet.org.uk> <87wplr1z4z.fsf@russet.org.uk> <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> <877fdqkwki.fsf@russet.org.uk> <9856a1e4-be41-d781-bfbd-22bac360d18b@yandex.ru> <871t3y85oz.fsf@russet.org.uk> <6b6f147e-3b42-ccf5-92fd-0890d6942d4b@yandex.ru> <87vb19zilb.fsf@russet.org.uk> <36d92078-759f-94bd-d381-20d7727c9c85@yandex.ru> <7fc2c908-fbb2-0870-2370-9e340acccc1c@yandex.ru> <87shwclsbt.fsf@russet.org.uk> <22eef879-5dd3-894c-ac72-d831421b96be@yandex.ru> <87ziqefeyu.fsf@russet.org.uk> From: Dmitry Gutov Message-ID: <909edc4c-5b79-5434-e5a1-e1e23f25ac57@yandex.ru> Date: Wed, 22 Jun 2016 02:06:53 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:47.0) Gecko/20100101 Thunderbird/47.0 MIME-Version: 1.0 In-Reply-To: <87ziqefeyu.fsf@russet.org.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 23769-done Cc: 23769-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On 06/21/2016 11:45 PM, Phillip Lord wrote: > It's "Phillip" actually, but "Phil" is easier. Oh. Sorry, Phillip. >> Could you please pull the latest changes from emacs-25, rebuild, and >> check that applying the patch from >> http://debbugs.gnu.org/cgi/bugreport.cgi?bug=23769#86 fixes this >> problem? > > Yes, this appears to work on the emacs-25 head. Thanks. Installed, with Eli's blessing. > Are you going to add the test case that I sent in also? If not, I'll > just add it to master (I don't think it will merge cleanly, so this > might be the best solution anyway). Yes, please go ahead with it on master. From unknown Sat Jun 21 10:39:56 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 20 Jul 2016 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator