Commit baee695a authored by Rasmus Pank Roulund's avatar Rasmus Pank Roulund Committed by Stefan Monnier
Browse files

* lisp/vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status

returns nil.

Fixes: debbugs:18391
parent 9bc6bb24
2014-09-04 Rasmus Pank Roulund <emacs@pank.eu>
* vc/vc-git.el (vc-git-conflicted-files): Fix bug when git status
returns nil (bug#18391).
2014-09-04 Stefan Monnier <monnier@iro.umontreal.ca>
 
* emacs-lisp/eldoc.el (eldoc-function-argstring): Don't strip
......
......@@ -774,7 +774,7 @@ This prompts for a branch to merge from."
"Return the list of files with conflicts in DIRECTORY."
(let* ((status
(vc-git--run-command-string directory "status" "--porcelain" "--"))
(lines (split-string status "\n" 'omit-nulls))
(lines (when status (split-string status "\n" 'omit-nulls)))
files)
(dolist (line lines files)
(when (string-match "\\([ MADRCU?!][ MADRCU?!]\\) \\(.+\\)\\(?: -> \\(.+\\)\\)?"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment