[Emacs-diffs] emacs/lisp ChangeLog vc-git.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/11/30 21:21:38

Modified files:
        lisp           : ChangeLog vc-git.el 

Log message:
        (vc-git-registered): Call vc-git-root only once.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16773&r2=1.16774
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-git.el?cvsroot=emacs&r1=1.100&r2=1.101

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16773
retrieving revision 1.16774
diff -u -b -r1.16773 -r1.16774
--- ChangeLog   30 Nov 2009 20:27:44 -0000      1.16773
+++ ChangeLog   30 Nov 2009 21:21:35 -0000      1.16774
@@ -1,3 +1,7 @@
+2009-11-30  Dan Nicolaescu  <address@hidden>
+
+       * vc-git.el (vc-git-registered): Call vc-git-root only once.
+
 2009-11-30  Juri Linkov  <address@hidden>
 
        * misearch.el (multi-isearch-read-buffers): Move canonicalization

Index: vc-git.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-git.el,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- vc-git.el   24 Nov 2009 15:31:06 -0000      1.100
+++ vc-git.el   30 Nov 2009 21:21:38 -0000      1.101
@@ -144,17 +144,17 @@
 
 (defun vc-git-registered (file)
   "Check whether FILE is registered with git."
-  (when (vc-git-root file)
+  (let ((dir (vc-git-root file)))
+    (when dir
     (with-temp-buffer
       (let* (process-file-side-effects
-            ;; do not use the `file-name-directory' here: git-ls-files
+              ;; Do not use the `file-name-directory' here: git-ls-files
             ;; sometimes fails to return the correct status for relative
             ;; path specs. 
-            ;; see also: http://marc.info/?l=git&m=125787684318129&w=2
-            (dir (vc-git-root file))
+              ;; See also: http://marc.info/?l=git&m=125787684318129&w=2
              (name (file-relative-name file dir))
              (str (ignore-errors
-                    (when dir (cd dir))
+                    (cd dir)
                     (vc-git--out-ok "ls-files" "-c" "-z" "--" name)
                     ;; if result is empty, use ls-tree to check for deleted 
file
                     (when (eq (point-min) (point-max))
@@ -163,7 +163,7 @@
         (and str
              (> (length str) (length name))
              (string= (substring str 0 (1+ (length name)))
-                      (concat name "\0")))))))
+                       (concat name "\0"))))))))
 
 (defun vc-git--state-code (code)
   "Convert from a string to a added/deleted/modified state."