From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.bugs Subject: bug#23769: 25.0.95; Mode Line breakage in vc-git 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1466024440 31429 80.91.229.3 (15 Jun 2016 21:00:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 15 Jun 2016 21:00:40 +0000 (UTC) Cc: 23769@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jun 15 23:00:29 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bDHvJ-0007Ls-0x for geb-bug-gnu-emacs@m.gmane.org; Wed, 15 Jun 2016 23:00:29 +0200 Original-Received: from localhost ([::1]:45069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDHvD-0006oU-10 for geb-bug-gnu-emacs@m.gmane.org; Wed, 15 Jun 2016 17:00:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDHkK-0005mI-MH for bug-gnu-emacs@gnu.org; Wed, 15 Jun 2016 16:49:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDHkE-0001r2-Mr for bug-gnu-emacs@gnu.org; Wed, 15 Jun 2016 16:49:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:58534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDHkE-0001qq-Gy for bug-gnu-emacs@gnu.org; Wed, 15 Jun 2016 16:49:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bDHkE-00017E-6x for bug-gnu-emacs@gnu.org; Wed, 15 Jun 2016 16:49:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: phillip.lord@russet.org.uk (Phillip Lord) Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 15 Jun 2016 20:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23769 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 23769-submit@debbugs.gnu.org id=B23769.14660237274263 (code B ref 23769); Wed, 15 Jun 2016 20:49:02 +0000 Original-Received: (at 23769) by debbugs.gnu.org; 15 Jun 2016 20:48:47 +0000 Original-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 Original-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==; Original-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 In-Reply-To: <91e61a46-b3bb-c4d9-cb30-bbfa90135d69@yandex.ru> (Dmitry Gutov's message of "Wed, 15 Jun 2016 00:52:48 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.95 (gnu/linux) 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:119601 Archived-At: --=-=-= 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 --=-=-=--