aboutsummaryrefslogtreecommitdiff
path: root/lisp/magit-remote.el
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2019-03-29 16:00:00 +0100
committerJonas Bernoulli <jonas@bernoul.li>2019-03-29 16:00:00 +0100
commitb2a7106b82455d7f571d483149d08592a85a8cc6 (patch)
tree598e1a29fda3e831600b2b7b0851ddac8901c4e6 /lisp/magit-remote.el
parent8f6c8f7aa7abf734ec461a579f63e0dde5eaabc5 (diff)
Change representation of unnamed upstreams
Diffstat (limited to 'lisp/magit-remote.el')
-rw-r--r--lisp/magit-remote.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/magit-remote.el b/lisp/magit-remote.el
index 438ecd0..cbf21f7 100644
--- a/lisp/magit-remote.el
+++ b/lisp/magit-remote.el
@@ -417,7 +417,10 @@ Delete the symbolic-ref \"refs/remotes/<remote>/HEAD\"."
(defun magit--upstream-suffix-description (&optional pushp)
(if-let ((upstream (magit-get-upstream-branch)))
- (cond ((magit-rev-verify upstream) upstream)
+ (cond ((consp upstream)
+ (pcase-let ((`(,url ,ref) upstream))
+ (insert ref " from " (propertize url 'face 'bold) " ")))
+ ((magit-rev-verify upstream) upstream)
(pushp (concat upstream ", creating it"))
;; This shouldn't happen often and even if it does, then
;; transfering would still succeed iff the branch exists