Browse Source

git.el: Avoid a lisp error when there's no current branch (detached HEAD).

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Alexandre Julliard 17 years ago committed by Junio C Hamano
parent
commit
ef08c14993
  1. 8
      contrib/emacs/git.el

8
contrib/emacs/git.el

@ -664,9 +664,11 @@ Return the list of files that haven't been handled." @@ -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: "

Loading…
Cancel
Save