gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Formatting.

Browse source
This commit is contained in:
Phil Jackson 2010-07-10 11:41:12 +01:00
parent b3beac42cb
commit 1a9ae85faa
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
magit.el
View file

@ -4171,15 +4171,15 @@ With prefix force the removal even it it hasn't been merged."
(defun magit--branch-view-details (branch-line) (defun magit--branch-view-details (branch-line)
"Extract details from branch -va output." "Extract details from branch -va output."
(string-match (concat (string-match (concat
"^\\(\\*? \\{1,2\\}\\)" ; current branch marker (maybe) "^\\(\\*? \\{1,2\\}\\)" ; current branch marker (maybe)
"\\(.+?\\) +" ; branch name "\\(.+?\\) +" ; branch name
"\\(?:" "\\(?:"
"\\([0-9a-fA-F]\\{7,8\\}\\) " ; sha1 "\\([0-9a-fA-F]\\{7,8\\}\\) " ; sha1
"\\|\\(-> \\)" ; or the pointer to a ref "\\|\\(-> \\)" ; or the pointer to a ref
"\\)" "\\)"
"\\(.+\\)" ; message or ref "\\(.+\\)" ; message or ref
) )
branch-line) branch-line)
(let ((res (list (cons 'current (match-string 1 branch-line)) (let ((res (list (cons 'current (match-string 1 branch-line))