[PATCH] git.el: Avoid a lisp error when there's no current branch (detached HEAD).
From: Alexandre Julliard <hidden>
Date: 2016-06-15 22:43:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Alexandre Julliard <redacted> --- contrib/emacs/git.el | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index be44e06..abc799a 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el@@ -664,9 +664,11 @@ Return the list of files that haven't been handled." (ewoc-set-hf status (format "Directory: %s\nBranch: %s\nHead: %s%s\n" default-directory - (if (string-match "^refs/heads/" branch) - (substring branch (match-end 0)) - branch) + (if branch + (if (string-match "^refs/heads/" branch) + (substring branch (match-end 0)) + branch) + "none (detached HEAD)") head (if merge-heads (concat "\nMerging: "
--
1.5.3.rc6.12.g7c176
--
Alexandre Julliard
julliard@winehq.org