aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc-git.el
diff options
context:
space:
mode:
authorDan Nicolaescu2008-03-21 05:53:48 +0000
committerDan Nicolaescu2008-03-21 05:53:48 +0000
commit6a3f9bb72de2ea13801701c98fe27fbf41d6a4f4 (patch)
treeed29e9f4d13739ac4bf06465fac758b626aeb548 /lisp/vc-git.el
parent5371d722ecd94db9d5b3b21f4b91d073a38bd73b (diff)
downloademacs-6a3f9bb72de2ea13801701c98fe27fbf41d6a4f4.tar.gz
emacs-6a3f9bb72de2ea13801701c98fe27fbf41d6a4f4.zip
* vc-hg.el (vc-hg-state):
* vc-git.el (vc-git-state): * vc-cvs.el (vc-cvs-parse-status): * vc-bzr.el (vc-bzr-state): Return 'added when the file is in that state.
Diffstat (limited to 'lisp/vc-git.el')
-rw-r--r--lisp/vc-git.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index c2295ddaddc..d6e9d674953 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -146,9 +146,9 @@
146 ;; FIXME: This can't set 'ignored yet 146 ;; FIXME: This can't set 'ignored yet
147 (vc-git--call nil "add" "--refresh" "--" (file-relative-name file)) 147 (vc-git--call nil "add" "--refresh" "--" (file-relative-name file))
148 (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--"))) 148 (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--")))
149 (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} [ADMU]\0[^\0]+\0" 149 (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\([ADMU]\\)\0[^\0]+\0"
150 diff)) 150 diff))
151 'edited 151 (if (string= (match-string 1 diff) "A") 'added 'edited)
152 'up-to-date))) 152 'up-to-date)))
153 153
154(defun vc-git--ls-files-state (state &rest args) 154(defun vc-git--ls-files-state (state &rest args)