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#19386: 24.4.51; vc-git-dir-status shows edited files as up-to-date when FILES is non-nil Date: Mon, 15 Dec 2014 16:12:45 +0200 Message-ID: <86y4q9ypb6.fsf@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418652864 31065 80.91.229.3 (15 Dec 2014 14:14:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 15 Dec 2014 14:14:24 +0000 (UTC) To: 19386@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Dec 15 15:14:17 2014 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 1Y0WPh-00053I-FY for geb-bug-gnu-emacs@m.gmane.org; Mon, 15 Dec 2014 15:14:17 +0100 Original-Received: from localhost ([::1]:39966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WPh-0004Tz-1C for geb-bug-gnu-emacs@m.gmane.org; Mon, 15 Dec 2014 09:14:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WPY-0004Sy-9M for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:14:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0WPS-00056q-57 for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:14:08 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37183) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WPS-00056m-2O for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:14:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Y0WPR-0005hu-Rf for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:14:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 15 Dec 2014 14:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19386 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.141865279521868 (code B ref -1); Mon, 15 Dec 2014 14:14:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 15 Dec 2014 14:13:15 +0000 Original-Received: from localhost ([127.0.0.1]:46549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y0WOg-0005ge-OI for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:13:15 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:51236) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y0WOe-0005gO-TH for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:13:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0WOT-0004cZ-TI for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:13:07 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:50125) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WOT-0004cQ-QT for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:13:01 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WON-0004B4-RG for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:13:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0WOH-0004UU-I0 for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:12:55 -0500 Original-Received: from mail-wg0-x232.google.com ([2a00:1450:400c:c00::232]:51507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WOH-0004U4-BK for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:12:49 -0500 Original-Received: by mail-wg0-f50.google.com with SMTP id a1so14808551wgh.9 for ; Mon, 15 Dec 2014 06:12:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:mime-version:content-type; bh=GO/uAGFaxsbHUhZAi4VkJhZIxhGf5ZxxW0HbLA2LCn8=; b=PV+XnpPg6+JD/0Z3CHWw4oGUUjIHWijjERYZn4aOwcrEAIX7WShXYm33SvZWKqaANB zs5EnJBLl5g9Bo6N7c5Uupsn2cNp/YkluA4Lv1G95tlSFssH4zYFkaMaqQq09N9zz8sZ KpVpZeM/BEXCna8xvcXW+RvNVOZl2wTY+zQgR8in7pRuQZk2PgH2hkZKd9HwIQq2ixMe s5tg++F1m7B2NQAYG1/ZVkI1AYwaA40OjVApJUq4IG7ji02nLJUOUhK3GSUlXISLxWHK 6XA5wE2p+crpQ3MnGXsEazvjZYea0PLBEACQwXan/sTRFUGN3JxFScMOePpeE1EeREiR z14Q== X-Received: by 10.180.85.4 with SMTP id d4mr31598338wiz.36.1418652768837; Mon, 15 Dec 2014 06:12:48 -0800 (PST) Original-Received: from axl ([82.102.93.58]) by mx.google.com with ESMTPSA id vm8sm13205855wjc.6.2014.12.15.06.12.47 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 15 Dec 2014 06:12:48 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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:97354 Archived-At: Because the `up-to-date' stage in `vc-git-after-dir-status-stage' calls 'git ls-files -z -c -s -- file1 file2 file3', and that output includes modified files (but not unregistered or ignored). To reproduce: ~/vc$ git init test Initialized empty Git repository in /home/gutov/vc/test/.git/ ~/vc$ cd test ~/vc/test$ echo foo > foo ~/vc/test$ touch .gitignore ~/vc/test$ git add .gitignore ~/vc/test$ git commit -m "Add .gitignore" [master (root-commit) e416e1c] Add .gitignore 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore ~/vc/test$ echo bar > .gitignore ~/vc/test$ echo bar > bar ~/vc/test$ git add foo ~/vc/test$ git commit -m "Add foo" [master 3a47057] Add foo 1 file changed, 1 insertion(+) create mode 100644 foo gutov@axl:~/vc/test$ touch tee gutov@axl:~/vc/test$ PATH=~/vc/emacs-24/src:$PATH emacs --batch --eval "(let (done) (vc-call-backend 'Git 'dir-status-files \".\" '(\"foo\" \"bar\" \"tee\" \".gitignore\") nil (lambda (entries &optional mtc) (message \"%s\" entries) (setq done (not mtc)))) (while (not done) (sleep-for 0.1)))" ((.gitignore up-to-date [cl-struct-vc-git-extra-fileinfo 33188 33188 nil nil]) (foo up-to-date [cl-struct-vc-git-extra-fileinfo 33188 33188 nil nil])) ((tee unregistered [cl-struct-vc-git-extra-fileinfo 0 0 nil nil])) ((bar ignored [cl-struct-vc-git-extra-fileinfo 0 0 nil nil])) The .gitignore entry above should be `edited'. The easiest solution seems to be to move the `up-to-date' stage to after `diff-index'. Fix forthcoming. In GNU Emacs 24.4.51.5 (x86_64-unknown-linux-gnu, GTK+ Version 3.10.8) of 2014-12-11 on axl Repository revision: 0c2f254bc3d69ba08a59037e8e192d5d7fb7d816 Windowing system distributor `The X.Org Foundation', version 11.0.11501000 System Description: Ubuntu 14.04.1 LTS