---
magit.el | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/magit.el b/magit.el
index 342bf87..ac25676 100644
--- a/magit.el
+++ b/magit.el
@@ -2201,6 +2201,11 @@ must return a string which will represent the log line.")
(magit-with-section 'status nil
(let* ((branch (magit-get-current-branch))
(remote (and branch (magit-get "branch" branch "remote")))
+ (remote-refs (when remote
+ (magit-get "branch" branch "merge")))
+ (remote-branch (when (and remote-refs
+ (string-match "^refs/heads/\\(.*\\)$"
remote-refs))
+ (match-string 1 remote-refs)))
(svn-info (magit-get-svn-ref-info))
(remote-string (magit-remote-string remote svn-info))
(head (magit-git-string
@@ -2231,7 +2236,7 @@ must return a string which will represent the log line.")
(magit-insert-pending-changes)
(magit-insert-pending-commits)
(when remote
- (magit-insert-unpulled-commits remote branch))
+ (magit-insert-unpulled-commits remote (or remote-branch branch)))
(when svn-info
(magit-insert-unpulled-svn-commits t))
(let ((staged (or no-commit (magit-anything-staged-p))))
@@ -2240,7 +2245,7 @@ must return a string which will represent the log line.")
(if staged
(magit-insert-staged-changes no-commit)))
(when remote
- (magit-insert-unpushed-commits remote branch))
+ (magit-insert-unpushed-commits remote (or remote-branch branch)))
(when svn-info
(magit-insert-unpushed-svn-commits t))))))
--
Rémi Vanicat
To unsubscribe from this group, send email to magit+unsubscribegooglegroups.com
or reply to this email with the words "REMOVE ME" as the subject.
