From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#21166: 24.4; vc-mode and git error on newly added file to new repository Date: Fri, 31 Jul 2015 20:44:16 +0300 Message-ID: <55BBB3F0.30709@yandex.ru> References: <7E039918541B4C4183BFDB8F015C743032E5C672@WCL-EXCH02.wcl.local> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1438364732 20115 80.91.229.3 (31 Jul 2015 17:45:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 31 Jul 2015 17:45:32 +0000 (UTC) To: Ed Avis , 21166@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jul 31 19:45:21 2015 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 1ZLEMw-0005fn-Qg for geb-bug-gnu-emacs@m.gmane.org; Fri, 31 Jul 2015 19:45:19 +0200 Original-Received: from localhost ([::1]:45510 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZLEMv-0001qq-Nc for geb-bug-gnu-emacs@m.gmane.org; Fri, 31 Jul 2015 13:45:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZLEMm-0001lj-Bx for bug-gnu-emacs@gnu.org; Fri, 31 Jul 2015 13:45:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZLEMg-0003dU-Ln for bug-gnu-emacs@gnu.org; Fri, 31 Jul 2015 13:45:08 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34583) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZLEMg-0003cx-Hd for bug-gnu-emacs@gnu.org; Fri, 31 Jul 2015 13:45:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1ZLEMg-0004Cj-1A for bug-gnu-emacs@gnu.org; Fri, 31 Jul 2015 13:45:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 31 Jul 2015 17:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 21166 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 21166-submit@debbugs.gnu.org id=B21166.143836466216101 (code B ref 21166); Fri, 31 Jul 2015 17:45:01 +0000 Original-Received: (at 21166) by debbugs.gnu.org; 31 Jul 2015 17:44:22 +0000 Original-Received: from localhost ([127.0.0.1]:36029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZLEM1-0004Bd-On for submit@debbugs.gnu.org; Fri, 31 Jul 2015 13:44:22 -0400 Original-Received: from mail-wi0-f176.google.com ([209.85.212.176]:34654) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZLEM0-0004BU-4h for 21166@debbugs.gnu.org; Fri, 31 Jul 2015 13:44:20 -0400 Original-Received: by wibud3 with SMTP id ud3so66759141wib.1 for <21166@debbugs.gnu.org>; Fri, 31 Jul 2015 10:44:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=aN9nfWnF8v1HdqfMLph2l8CmEOSAOCG9X3BSdcTaXR8=; b=VUuSONUplC/XfXAOKVfyjTsXsD/vlEyTg6T81LotNmAFhwCkNU3NYcYqyo+G1+k+ti AI8zYU3Rho9DrhGmV2MUCPfHWuW2pey3XgEzDuFGm6DVJpm7bIbX0ClRSor8921aL8q8 DgDVhEjUVO3x3UEC0kKJcXsabnVoaHEQgZvTylS/ln+EOuO+wIWPxnmdlTo/rVgaJoOE 6UlzKac4UyRK4q3cKyOZj643w13kx1sC7RzMETisOOWmoHhpBm2A2FLRuCt7bsMxF9oB WEzKHNnc/xNDfXjVW3LWdJ6oOxMHXgzqM0C+StxLByKZGp4i0zNI4NGFYF2Nz2WUMMtF CzJg== X-Received: by 10.194.2.9 with SMTP id 9mr7890514wjq.95.1438364659404; Fri, 31 Jul 2015 10:44:19 -0700 (PDT) Original-Received: from [10.9.0.103] (nat.webazilla.com. [78.140.128.228]) by smtp.googlemail.com with ESMTPSA id x6sm5553615wiy.6.2015.07.31.10.44.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2015 10:44:18 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:40.0) Gecko/20100101 Thunderbird/40.0 In-Reply-To: <7E039918541B4C4183BFDB8F015C743032E5C672@WCL-EXCH02.wcl.local> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:105248 Archived-At: On 07/31/2015 08:27 PM, Ed Avis wrote: > I guess you don't have to add an extra process call but just check for this error message, and if so, show the diff as from an empty tree. That's a good point, but doing an extra process call depending on the result of the first is also non-trivial here, because the first call is often asynchronous, and we handle those in a not particularly composable way. For instance, this patch doesn't work reliably: diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 9522328..b556de1 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1032,13 +1032,18 @@ or BRANCH^ (where \"^\" can be repeated)." command "--exit-code" (append (vc-switches 'git 'diff) - (list "-p" (or rev1 "HEAD") rev2 "--"))) + (list "-p" rev1 rev2 "--"))) (vc-git-command (or buffer "*vc-diff*") 1 files "difftool" "--exit-code" "--no-prompt" "-x" (concat "diff " (mapconcat 'identity (vc-switches nil 'diff) " ")) - rev1 rev2 "--")))) + rev1 rev2 "--")) + (vc-run-delayed + (when (looking-at "fatal: bad revision 'HEAD'") + (let ((inhibit-read-only t)) + (erase-buffer) + (vc-git-diff files "4b825dc642cb6eb9a060e54bf8d69288fbee4904" rev2 buffer async)))))) (defun vc-git-revision-table (_files) ;; What about `files'?!? --Stef