From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs,gmane.emacs.pretest.bugs Subject: bug#2982: 23.0.92; `vc-diff' behaves inconsistently with git Date: Mon, 13 Apr 2009 13:58:48 -0400 Message-ID: References: Reply-To: Stefan Monnier , 2982@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1239647063 21711 80.91.229.12 (13 Apr 2009 18:24:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 13 Apr 2009 18:24:23 +0000 (UTC) Cc: emacs-pretest-bug@gnu.org, 2982@emacsbugs.donarmstrong.com To: Markus Triska Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Apr 13 20:25:42 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LtQqi-0007Ia-6a for geb-bug-gnu-emacs@m.gmane.org; Mon, 13 Apr 2009 20:25:40 +0200 Original-Received: from localhost ([127.0.0.1]:36462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LtQpJ-0008NE-DP for geb-bug-gnu-emacs@m.gmane.org; Mon, 13 Apr 2009 14:24:13 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LtQp5-0008IM-98 for bug-gnu-emacs@gnu.org; Mon, 13 Apr 2009 14:23:59 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LtQp0-0008Hi-K9 for bug-gnu-emacs@gnu.org; Mon, 13 Apr 2009 14:23:58 -0400 Original-Received: from [199.232.76.173] (port=51690 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LtQp0-0008HO-0F for bug-gnu-emacs@gnu.org; Mon, 13 Apr 2009 14:23:54 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:51868) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LtQoz-0006G9-E0 for bug-gnu-emacs@gnu.org; Mon, 13 Apr 2009 14:23:53 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n3DINoxX007728; Mon, 13 Apr 2009 11:23:50 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id n3DI58QP002560; Mon, 13 Apr 2009 11:05:08 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Stefan Monnier Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Mon, 13 Apr 2009 18:05:08 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 2982 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 2982-submit@emacsbugs.donarmstrong.com id=B2982.123964553732619 (code B ref 2982); Mon, 13 Apr 2009 18:05:08 +0000 Original-Received: (at 2982) by emacsbugs.donarmstrong.com; 13 Apr 2009 17:58:57 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from ironport2-out.teksavvy.com (ironport2-out.pppoe.ca [206.248.154.182]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n3DHwsNm032599 for <2982@emacsbugs.donarmstrong.com>; Mon, 13 Apr 2009 10:58:56 -0700 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AiAFAAca40lLd+7D/2dsb2JhbACBUstdg3wGhRY X-IronPort-AV: E=Sophos;i="4.40,180,1238990400"; d="scan'208";a="36965306" Original-Received: from 75-119-238-195.dsl.teksavvy.com (HELO ceviche.home) ([75.119.238.195]) by ironport2-out.teksavvy.com with ESMTP; 13 Apr 2009 13:58:48 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id E30CC70764; Mon, 13 Apr 2009 13:58:48 -0400 (EDT) In-Reply-To: (Markus Triska's message of "Mon, 13 Apr 2009 13:23:01 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.92 (gnu/linux) X-CrossAssassin-Score: 2 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Mon, 13 Apr 2009 14:23:58 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:27136 gmane.emacs.pretest.bugs:24273 Archived-At: > although, as before, a.txt is unchanged. In a new Emacs instance, > "C-x v =" again behaves like the first time. git version: 1.6.2. VC tries to avoid running the backend for "vc-diff" when the file is unchanged, by keeping track of the file's modtime when the backend (in this case, git) tells VC that the file is up-to-date. So when you open the file, Emacs asks `git' the status of the file and so knows that this modtime corresponds to "up-to-date". After `touch', OTOH, Emacs isn't so sure any more, so it runs `git diff' which happens to output "diff --git a/a.txt b/a.txt". IIRC if "git diff" didn't output anything at all, the *vc-diff* window would not be made visible and VC would have also indicated "No changes between working revision and workfile", but since "git diff" did output something, VC presumes that there is some kind of difference (without trying to understand the actual content of that process output). Stefan