Fixes: debbugs:11344

* vc/vc-git.el (vc-git-state): Fix regexp matching diff output.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 834f54bc96e9af838b6e4ffee472dc630d8343ca..6d3fcf971b1e952c91967761c46073c2efb6d818 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-26  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * vc/vc-git.el (vc-git-state): Fix regexp matching diff output.
+       (Bug#11344)
+
 2012-04-24  Chong Yidong  <cyd@gnu.org>
 
        * select.el (xselect--encode-string): New function, split from

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index b71dc95dba2d0c5a91adeddfea8f6c19187e084a..9aa2ee72b558fc01f9052063fad3f786a058c6f4 100644 (file)
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -220,7 +220,7 @@ matching the resulting Git log output, and KEYWORDS is a list of
     (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\\(.\\)?"
+              (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\([ADMUT]\\)\0[^\0]+\0\\(.*\n.\\)?"
                             diff))
           (let ((diff-letter (match-string 1 diff)))
             (if (not (match-beginning 2))