Subject: bug#19386: closed (Re: bug#19386: Acknowledgement (24.4.51; vc-git-dir-status shows edited files as up-to-date when FILES is non-nil))

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 15 Dec 2014 14:57:03 +0000

Your bug report

#19386: 24.4.51; vc-git-dir-status shows edited files as up-to-date when FILES is non-nil

which was filed against the emacs package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
19386: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19386
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#19386: Acknowledgement (24.4.51; vc-git-dir-status shows edited files as up-to-date when FILES is non-nil)
From: Dmitry Gutov <[email-masked]>
To: [email-masked]
Date: Mon, 15 Dec 2014 16:56:25 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Version: 24.5

Fixed on emacs-24.

Subject: 24.4.51; vc-git-dir-status shows edited files as up-to-date when FILES is non-nil
From: Dmitry Gutov <[email-masked]>
To: [email-masked]
Date: Mon, 15 Dec 2014 16:12:45 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

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