diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-04-26 11:27:37 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2012-04-26 11:27:37 +0200 |
| commit | c4347ab9e544ae8c8a704fe29504ac7af4b21e66 (patch) | |
| tree | a0e74b29650e356b9a03f66fd649d2ca311a3566 | |
| parent | 88ed9e87e565504e377ff3dfcdbacbbbeb382926 (diff) | |
| download | emacs-c4347ab9e544ae8c8a704fe29504ac7af4b21e66.tar.gz | |
Fixes: debbugs:11344
* vc/vc-git.el (vc-git-state): Fix regexp matching diff output.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 2 |
2 files changed, 6 insertions, 1 deletions
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)) |