From b59f493863011d5b8a52c4b534b52361e7b35b42 Mon Sep 17 00:00:00 2001 From: Phil Jackson Date: Tue, 8 Jun 2010 11:48:48 +0100 Subject: [PATCH] Remote tag back in the buffer list. --- magit.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/magit.el b/magit.el index 18bf6368..db5a216f 100644 --- a/magit.el +++ b/magit.el @@ -4041,7 +4041,7 @@ With prefix force the removal even it it hasn't been merged." "Extract details from branch -va output." (string-match (concat "^\\(\\*? \\{1,2\\}\\)" ; current branch marker (maybe) - "\\(remotes/\\)?\\(.+?\\) +" ; is it remote, branch name + "\\(.+?\\) +" ; branch name "\\(?:" "\\([0-9a-fA-F]\\{7\\}\\) " ; sha1 @@ -4052,14 +4052,13 @@ With prefix force the removal even it it hasn't been merged." ) branch-line) (let ((res (list (cons 'current (match-string 1 branch-line)) - (cons 'remote (not (not (match-string 2 branch-line)))) - (cons 'branch (match-string 3 branch-line))))) - (if (match-string 5 branch-line) + (cons 'branch (match-string 2 branch-line))))) + (if (match-string 4 branch-line) (cons (cons 'other-ref (match-string 6 branch-line)) res) (append (list - (cons 'sha1 (match-string 4 branch-line)) - (cons 'msg (match-string 6 branch-line))) + (cons 'sha1 (match-string 3 branch-line)) + (cons 'msg (match-string 5 branch-line))) res)))) (defun magit-show-branches ()