From 8bcbcb369e2c4fb047c581e5df3b5a3613b5f371 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 20 Jun 2010 11:45:50 +0200 Subject: [PATCH] Set 'remote branch' text property in branch view This only works with git versions that prefix remote branches with "remotes/" in the output of "git branch -va". git 1.7 and 1.6.3 do, git 1.5.6.5 does not. --- magit.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/magit.el b/magit.el index 63f5c1a8..1d7d2e85 100644 --- a/magit.el +++ b/magit.el @@ -4084,7 +4084,8 @@ 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 'branch (match-string 2 branch-line))))) + (cons 'branch (match-string 2 branch-line)) + (cons 'remote (string-match-p "^remotes/" (match-string 2 branch-line)))))) (if (match-string 4 branch-line) (cons (cons 'other-ref (match-string 6 branch-line)) res) (append