From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Mon, 27 Aug 2007 18:59:41 +0000 (+0000)
Subject: * vc-git.el (vc-git-state): Call git-add --refresh to update the
X-Git-Tag: emacs-pretest-22.1.90~888
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=00d670807ec2370ad89b816d05d8a7c40f23d28b;p=emacs.git

* vc-git.el (vc-git-state): Call git-add --refresh to update the
state of the file.
(vc-git-workfile-unchanged-p): Delegate implementation to
vc-git-state.
(vc-git-create-repo): Fixed invalid command.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69fb14c19f5..fbfa25d3a5d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-27  Alexandre Julliard  <julliard@winehq.org>
+
+        * vc-git.el (vc-git-state): Call git-add --refresh to update the
+	state of the file.
+        (vc-git-workfile-unchanged-p): Delegate implementation to
+	vc-git-state.
+	(vc-git-create-repo): Fixed invalid command.
+	
 2007-08-27  Richard Stallman  <rms@gnu.org>
 
 	* textmodes/flyspell.el (flyspell-mode):
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 8dd6562f24b..ed4b1270972 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -143,6 +143,7 @@
 
 (defun vc-git-state (file)
   "Git-specific version of `vc-state'."
+  (call-process "git" nil nil nil "add" "--refresh" "--" (file-relative-name file))
   (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--")))
     (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} [ADMU]\0[^\0]+\0" diff))
         'edited
@@ -189,24 +190,7 @@
   'implicit)
 
 (defun vc-git-workfile-unchanged-p (file)
-  ;; The reason this does not use the result of vc-git-state is that
-  ;; git-diff-index (used by vc-git-state) doesn't refresh the cached
-  ;; stat info, so if the file has been modified it will always show
-  ;; up as modified in vc-git-state, even if the change has been
-  ;; undone, until git-update-index --refresh is run.
-
-  ;; OTOH the vc-git-workfile-unchanged-p implementation checks the
-  ;; actual content, so it will detect the case of a file reverted
-  ;; back to its original state.
-
-  ;; The ideal implementation would be to refresh the stat cache and
-  ;; then call vc-git-state, but at the moment there's no git command
-  ;; to refresh a single file, so this will have to be added first.
-  (let ((sha1 (vc-git--run-command-string file "hash-object" "--"))
-        (head (vc-git--run-command-string file "ls-tree" "-z" "HEAD" "--")))
-    (and head
-         (string-match "[0-7]\\{6\\} blob \\([0-9a-f]\\{40\\}\\)\t[^\0]+\0" head)
-         (string= (car (split-string sha1 "\n")) (match-string 1 head)))))
+  (eq 'up-to-date (vc-git-state file)))
 
 (defun vc-git-dired-state-info (file)
   "Git-specific version of `vc-dired-state-info'."
@@ -220,7 +204,7 @@
 
 (defun vc-git-create-repo ()
   "Create a new Git repository."
-  (vc-git-command "init" nil 0 nil))
+  (vc-git-command nil 0 nil "init"))
 
 (defun vc-git-register (files &optional rev comment)
   "Register FILE into the git version-control system."