diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2025-01-02 14:06:35 +0100 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2025-01-02 14:06:35 +0100 |
| commit | 49359e4f459a647557e48b1721e5adc8c68fb1a4 (patch) | |
| tree | f62248de6d373ca5d0c68bca606912e61c2b0d61 /lisp/magit-refs.el | |
| parent | 7dfebba55bf687a25049882c2316166d968048ea (diff) | |
magit-refs--format-local-{branches,branch}: Fix value exchange
`push' is not part of the latter's return value.
Diffstat (limited to 'lisp/magit-refs.el')
| -rw-r--r-- | lisp/magit-refs.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/magit-refs.el b/lisp/magit-refs.el index eb072ba..ce16c4b 100644 --- a/lisp/magit-refs.el +++ b/lisp/magit-refs.el @@ -653,8 +653,9 @@ line is inserted at all." def (pcase-let ((`(,min . ,max) def)) (min max (apply #'max min (mapcar #'car lines))))))) - (mapcar (pcase-lambda (`(,_ ,branch ,focus ,branch-desc ,u:ahead ,p:ahead - ,u:behind ,upstream ,p:behind ,push ,msg)) + (mapcar (pcase-lambda (`( ,_ ,branch ,focus + ,branch-desc ,u:ahead ,p:ahead + ,u:behind ,upstream ,p:behind ,msg)) (list branch focus branch-desc u:ahead p:ahead (make-string (max 1 (- magit-refs-primary-column-width (length (concat branch-desc @@ -662,8 +663,7 @@ line is inserted at all." p:ahead u:behind)))) ?\s) - u:behind upstream p:behind push - msg)) + u:behind upstream p:behind msg)) lines))) (defun magit-refs--format-local-branch (line) @@ -713,7 +713,8 @@ line is inserted at all." (list (1+ (length (concat branch-desc u:ahead p:ahead u:behind))) branch (magit-refs--format-focus-column branch headp) - branch-desc u:ahead p:ahead u:behind + branch-desc u:ahead p:ahead + u:behind (and upstream (concat (if (equal u:track "[gone]") (magit--propertize-face upstream 'error) |