[Emacs-diffs] /srv/bzr/emacs/trunk r107694: Fixes: debbugs:11109

[Andreas Schwab]

------------------------------------------------------------
revno: 107694
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Wed 2012-03-28 12:12:02 +0200
message:
  Fixes: debbugs:11109
  
  * vc/vc-git.el (vc-git-state): Don't try to match all of the diff
  contents.
modified:
  lisp/ChangeLog
  lisp/vc/vc-git.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-27 20:43:09 +0000
+++ b/lisp/ChangeLog    2012-03-28 10:12:02 +0000
@@ -1,3 +1,8 @@
+2012-03-28  Andreas Schwab  <address@hidden>
+
+       * vc/vc-git.el (vc-git-state): Don't try to match all of the diff
+       contents.  (Bug#11109)
+
 2012-03-27  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/avl-tree.el (avl-tree--enter-balance): Fix paren typo

=== modified file 'lisp/vc/vc-git.el'
--- a/lisp/vc/vc-git.el 2012-03-26 03:08:15 +0000
+++ b/lisp/vc/vc-git.el 2012-03-28 10:12:02 +0000
@@ -220,11 +220,10 @@
     (let ((diff (vc-git--run-command-string
                  file "diff-index" "-p" "--raw" "-z" "HEAD" "--")))
       (if (and diff
-              (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} 
[0-9a-f]\\{40\\} \\([ADMUT]\\)\0[^\0]+\0\\(\\(?:.\\|\n\\)*\\)\\'"
+              (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} 
[0-9a-f]\\{40\\} \\([ADMUT]\\)\0[^\0]+\0\\(.\\)?"
                             diff))
-          (let ((diff-letter (match-string 1 diff))
-                (diff-contents (match-string 2 diff)))
-            (if (not (string-match "\n." diff-contents))
+          (let ((diff-letter (match-string 1 diff)))
+            (if (not (match-beginning 2))
                 ;; Empty diff: file contents is the same as the HEAD
                 ;; revision, but timestamps are different (eg, file
                 ;; was "touch"ed).  Update timestamp in index: