From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.bugs Subject: bug#39285: 28.0.50; vc-dir on gitdir results in error Date: Mon, 27 Jan 2020 12:11:28 +0100 Message-ID: References: <87lfpvqjzq.fsf@everybody.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="89212"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 39285@debbugs.gnu.org, "Mark A. Hershberger" To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jan 27 12:12:16 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iw2JU-000NAd-5k for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 27 Jan 2020 12:12:16 +0100 Original-Received: from localhost ([::1]:43248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw2JS-0001mo-TD for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 27 Jan 2020 06:12:14 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49324) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iw2JH-0001kD-Bt for bug-gnu-emacs@gnu.org; Mon, 27 Jan 2020 06:12:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iw2JG-0003Dm-6m for bug-gnu-emacs@gnu.org; Mon, 27 Jan 2020 06:12:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:51865) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iw2JG-0003D7-0m for bug-gnu-emacs@gnu.org; Mon, 27 Jan 2020 06:12:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iw2JF-0001j2-Sj for bug-gnu-emacs@gnu.org; Mon, 27 Jan 2020 06:12:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Robert Pluim Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 27 Jan 2020 11:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39285 X-GNU-PR-Package: emacs Original-Received: via spool by 39285-submit@debbugs.gnu.org id=B39285.15801234986603 (code B ref 39285); Mon, 27 Jan 2020 11:12:01 +0000 Original-Received: (at 39285) by debbugs.gnu.org; 27 Jan 2020 11:11:38 +0000 Original-Received: from localhost ([127.0.0.1]:57838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iw2Is-0001iR-Ds for submit@debbugs.gnu.org; Mon, 27 Jan 2020 06:11:38 -0500 Original-Received: from mail-wm1-f65.google.com ([209.85.128.65]:56058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iw2Ip-0001i8-SV for 39285@debbugs.gnu.org; Mon, 27 Jan 2020 06:11:36 -0500 Original-Received: by mail-wm1-f65.google.com with SMTP id q9so6351389wmj.5 for <39285@debbugs.gnu.org>; Mon, 27 Jan 2020 03:11:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :mime-version; bh=LMluW09MSOn6I1Rx8JSemSkkxCLMtGowYBkjds+ZmWM=; b=SJcYFOehv4crCMrn0fQyWLwJuC857H+kAm1SqZ8KUPORzaYq15/U7bWDzW/+opaS2X Wjocsoptyixcnvhb4Srb3zTt5KFEBtEQlHLydzxixq5fNRpuUg2ttpSTO4VgHPDtxSWa KNpUAJ+r8cJX2DV9MmTCySW7V7AVFJWaP4Jr6eVTaat68vX22chH985lLHA0Im8P7RkM rYzDjFdq0nt7wbYOq/7f+AOE5QUyckJf5SdSUrsoey5eF5HD0hR06TyJ3EK89TaBuDRD crhllBNDqFXELoZzzAF4uEf7XeGasBp1eeAeKjIOmvjUQtlfPoTB0/HJED/KemR0yun0 +lnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version; bh=LMluW09MSOn6I1Rx8JSemSkkxCLMtGowYBkjds+ZmWM=; b=HmWeGIeQAlvQOXeP+dX/9+svwrzqf88e65xRm1GNfWJNEHTVodohEi/Q286cy5/vLB sRTheXFsxgSupmnki/9F6CtAEZhCW01UeHH84CwpnUwpJtfyZgHaRwq0POVINwU3YKMD s3ye28qn+nyvPJuZ1d3QzRiDWQ87q7zbp+0vRJANSP+Azc+fZUYkWh601TyAc6A5Vlbo 5E2LZWj8+eta8uruJ9gy2bsJTPmvG66ydNXCMzMEn2cw8z43o3VjbjBHADm0uDg85vfH SEFUEP5BGrzjPSr/uIF8D9+IQfzutQHD6zmtNm4dKt64TyEjB0mQ9vmmvENtLunr5uWc J+6w== X-Gm-Message-State: APjAAAU30s1nXEtc47W0Am7hqg2ytrvAgncnE+TBNYGOS0QMPsp5F3gL DU/BGqSMt4OsOdPlnCK9xEuBeG3V X-Google-Smtp-Source: APXvYqyaNwoRil/tl+RFZpOvYYH7ENKZijXe6DtclvpkT2EH3a4p6YEqh9Qalkt9GfHdXF5TaZJy9g== X-Received: by 2002:a05:600c:242:: with SMTP id 2mr11208414wmj.2.1580123489818; Mon, 27 Jan 2020 03:11:29 -0800 (PST) Original-Received: from rpluim-mac ([2a01:e34:ecfc:a860:1525:4cba:5b05:6226]) by smtp.gmail.com with ESMTPSA id b10sm21872553wrt.90.2020.01.27.03.11.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 03:11:29 -0800 (PST) In-Reply-To: (Dmitry Gutov's message of "Mon, 27 Jan 2020 08:49:20 +0300") 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: 209.51.188.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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:175328 Archived-At: >>>>> On Mon, 27 Jan 2020 08:49:20 +0300, Dmitry Gutov said: Dmitry> Hi there! Dmitry> On 26.01.2020 0:55, Mark A. Hershberger wrote: >> While trying projectile's "Browse dirty projects", I hit an error. >> I >> was able to reproduce this error using >> (vc-dir "/home/mah/work/code/emacs/.git/") >> or any other git dir. Dmitry> What kind of directory is this? Dmitry> Normally, .git is a utility directory which is not considered part of Dmitry> the work tree. So most git commands fail inside it. Shouldn't 'vc-dir' have errored out before, since the ".git" directory is not vc-controlled? Dmitry> I suppose vc-git-stash-list could handle this better, but you still Dmitry> won't get anything better than a misleadingly empty VC-Dir buffer. The Dmitry> current behavior might even be better in that regard. Dmitry> This patch would make it shut up, though: Dmitry> diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el Dmitry> index 61e6c642d1..9b3f3c6545 100644 Dmitry> --- a/lisp/vc/vc-git.el Dmitry> +++ b/lisp/vc/vc-git.el Dmitry> @@ -1688,12 +1688,14 @@ vc-git-stash-snapshot Dmitry> (vc-resynch-buffer (vc-git-root default-directory) t t)) Dmitry> (defun vc-git-stash-list () Dmitry> - (delete Dmitry> - "" Dmitry> - (split-string Dmitry> - (replace-regexp-in-string Dmitry> - "^stash@" " " (vc-git--run-command-string nil Dmitry> "stash" "list")) Dmitry> - "\n"))) Dmitry> + (let ((out (vc-git--run-command-string nil "stash" "list"))) Dmitry> + (when out Dmitry> + (delete Dmitry> + "" Dmitry> + (split-string Dmitry> + (replace-regexp-in-string Dmitry> + "^stash@" " " out) Dmitry> + "\n"))))) Dmitry> (defun vc-git-stash-get-at-point (point) Dmitry> (save-excursion LGTM. Robert