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

Remote tag back in the buffer list.

Browse source
This commit is contained in:
Phil Jackson 2010-06-08 11:48:48 +01:00
parent 1dc342aad8
commit b59f493863
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
magit.el
View file

@ -4041,7 +4041,7 @@ With prefix force the removal even it it hasn't been merged."
"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)
"\\(remotes/\\)?\\(.+?\\) +" ; is it remote, branch name "\\(.+?\\) +" ; branch name
"\\(?:" "\\(?:"
"\\([0-9a-fA-F]\\{7\\}\\) " ; sha1 "\\([0-9a-fA-F]\\{7\\}\\) " ; sha1
@ -4052,14 +4052,13 @@ With prefix force the removal even it it hasn't been merged."
) )
branch-line) branch-line)
(let ((res (list (cons 'current (match-string 1 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 2 branch-line)))))
(cons 'branch (match-string 3 branch-line))))) (if (match-string 4 branch-line)
(if (match-string 5 branch-line)
(cons (cons 'other-ref (match-string 6 branch-line)) res) (cons (cons 'other-ref (match-string 6 branch-line)) res)
(append (append
(list (list
(cons 'sha1 (match-string 4 branch-line)) (cons 'sha1 (match-string 3 branch-line))
(cons 'msg (match-string 6 branch-line))) (cons 'msg (match-string 5 branch-line)))
res)))) res))))
(defun magit-show-branches () (defun magit-show-branches ()