From: Andreas Schwab <schwab@linux-m68k.org>
Date: Thu, 26 Apr 2012 09:27:37 +0000 (+0200)
Subject: Fixes: debbugs:11344
X-Git-Tag: emacs-24.0.96~12
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c4347ab9e544ae8c8a704fe29504ac7af4b21e66;p=emacs.git

Fixes: debbugs:11344

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 834f54bc96e..6d3fcf971b1 100644
--- 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 b71dc95dba2..9aa2ee72b55 100644
--- 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))