diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2025-07-31 11:53:17 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2025-07-31 11:53:17 +0200 |
| commit | 9b83b1e3175ce89d48cfe0d83c79cf5c677cab52 (patch) | |
| tree | c7c5f681041149fadc3d3dcc2b0cf9f7757eb9bd | |
| parent | cdab61a978759e4e0448ebd15a23180eecc3a294 (diff) | |
magit-split-range: Cosmetics
| -rw-r--r-- | lisp/magit-git.el | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/magit-git.el b/lisp/magit-git.el index 19b5b44..692a8a3 100644 --- a/lisp/magit-git.el +++ b/lisp/magit-git.el @@ -2511,14 +2511,13 @@ and this option only controls what face is used.") "\\([^.][^ \t]*\\)?\\'")) ; revB (defun magit-split-range (range) - (pcase-let ((`(,beg ,end ,sep) (magit--split-range-raw range))) - (and sep - (let ((beg (or beg "HEAD")) + (pcase-let* ((`(,beg ,end ,sep) (magit--split-range-raw range)) + (beg (or beg "HEAD")) (end (or end "HEAD"))) - (if (string-equal sep "...") - (and-let* ((base (magit-git-string "merge-base" beg end))) - (cons base end)) - (cons beg end)))))) + (pcase sep + (".." (cons beg end)) + ("..." (and-let* ((base (magit-git-string "merge-base" beg end))) + (cons base end)))))) (defun magit--split-range-raw (range) (and (string-match magit-range-re range) |