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

returns nil.

Fixes: debbugs:18391

2 files changed, 19 insertions, 14 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24adcdc13c9..b2912deb23e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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
@@ -195,27 +200,27 @@
 2014-08-24  Alan Mackenzie  <acm@muc.de>
 
         Handle C++11's "auto" and "decltype" constructions.
-        * progmodes/cc-engine.el (c-forward-type): Enhance to recognise
+        * progmodes/cc-engine.el (c-forward-type): Enhance to recognise
         and return 'decltype.
-        (c-forward-decl-or-cast-1): New let variables backup-kwd-sym,
+        (c-forward-decl-or-cast-1): New let variables backup-kwd-sym,
         prev-kwd-sym, new-style-auto.  Enhance to handle the new "auto"
         keyword.
-        * progmodes/cc-fonts.el (c-font-lock-declarations): Handle the
+        * progmodes/cc-fonts.el (c-font-lock-declarations): Handle the
         "decltype" keyword.
-        (c-font-lock-c++-new): Handle "decltype" constructions.
-        * progmodes/cc-langs.el (c-auto-ops, c-auto-ops-re):
+        (c-font-lock-c++-new): Handle "decltype" constructions.
+        * progmodes/cc-langs.el (c-auto-ops, c-auto-ops-re):
         New c-lang-defconsts/defvars.
-        (c-haskell-op, c-haskell-op-re): New c-lang-defconsts/defvars.
-        (c-typeof-kwds, c-typeof-key): New c-lang-defconsts/defvars.
-        (c-typeless-decl-kwds): Append "auto" onto the C++ value.
-        (c-not-decl-init-keywords): Also exclude c-typeof-kwds from value.
+        (c-haskell-op, c-haskell-op-re): New c-lang-defconsts/defvars.
+        (c-typeof-kwds, c-typeof-key): New c-lang-defconsts/defvars.
+        (c-typeless-decl-kwds): Append "auto" onto the C++ value.
+        (c-not-decl-init-keywords): Also exclude c-typeof-kwds from value.
 
         Make ">>" act as double template ender in C++ Mode.
-        * progmodes/cc-langs.el (c->-op-cont-tokens): New lang-const split
+        * progmodes/cc-langs.el (c->-op-cont-tokens): New lang-const split
         off from c->-op-cont-re.
-        (c->-op-cont-tokens): Change to use the above.
-        (c->-op-without->-cont-regexp): New lang-const.
-        * progmodes/cc-engine.el (c-forward-<>-arglist-recur):
+        (c->-op-cont-tokens): Change to use the above.
+        (c->-op-without->-cont-regexp): New lang-const.
+        * progmodes/cc-engine.el (c-forward-<>-arglist-recur):
         Use c->-op-without->-cont-regexp in place of c->-op-cont-tokens.
 
 
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index e9d55336af7..afcfd666082 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -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?!]\\) \\(.+\\)\\(?: -> \\(.+\\)\\)?"