From 1a9ae85faaa3bb98954a869b4204eb3d3cfef265 Mon Sep 17 00:00:00 2001 From: Phil Jackson Date: Sat, 10 Jul 2010 11:41:12 +0100 Subject: [PATCH] Formatting. --- magit.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/magit.el b/magit.el index 5d5d16b7..847b5625 100644 --- a/magit.el +++ b/magit.el @@ -4171,15 +4171,15 @@ With prefix force the removal even it it hasn't been merged." (defun magit--branch-view-details (branch-line) "Extract details from branch -va output." (string-match (concat - "^\\(\\*? \\{1,2\\}\\)" ; current branch marker (maybe) - "\\(.+?\\) +" ; branch name + "^\\(\\*? \\{1,2\\}\\)" ; current branch marker (maybe) + "\\(.+?\\) +" ; branch name "\\(?:" - "\\([0-9a-fA-F]\\{7,8\\}\\) " ; sha1 - "\\|\\(-> \\)" ; or the pointer to a ref + "\\([0-9a-fA-F]\\{7,8\\}\\) " ; sha1 + "\\|\\(-> \\)" ; or the pointer to a ref "\\)" - "\\(.+\\)" ; message or ref + "\\(.+\\)" ; message or ref ) branch-line) (let ((res (list (cons 'current (match-string 1 branch-line))