mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Fixes: debbugs:11344

Browse source 
* vc/vc-git.el (vc-git-state): Fix regexp matching diff output.
This commit is contained in:
Andreas Schwab 2012-04-26 11:27:37 +02:00
parent 88ed9e87e5
commit c4347ab9e5
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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

2
lisp/vc/vc-git.el
View file

@ -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))