[nongnu] elpa/git-commit 3ebc4e84db 07/10: magit-diff-refresh-buffer: Fix magit-set-header-line-format

[ELPA Syncer]

branch: elpa/git-commit
commit 3ebc4e84dbeed88e8e73c2d1e8bd668afcd7781f
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    magit-diff-refresh-buffer: Fix magit-set-header-line-format
---
 lisp/magit-diff.el | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index 9609a000b6..e1256091db 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -1939,14 +1939,16 @@ Staging and applying changes is documented in info node
    (if (equal magit-buffer-typearg "--no-index")
        (apply #'format "Differences between %s and %s" magit-buffer-diff-files)
      (concat (if magit-buffer-range
-                 (cond
-                  ((string-match-p "\\(\\.\\.\\|\\^-\\)"
-                                   magit-buffer-range)
-                   (format "Changes in %s" magit-buffer-range))
-                  ((member "-R" magit-buffer-diff-args)
-                   (format "Changes from working tree to %s" 
magit-buffer-range))
-                  (t
-                   (format "Changes from %s to working tree" 
magit-buffer-range)))
+                 (if (string-match-p "\\(\\.\\.\\|\\^-\\)"
+                                     magit-buffer-range)
+                     (format "Changes in %s" magit-buffer-range)
+                   (let ((msg "Changes from %s to %s")
+                         (end (if (equal magit-buffer-typearg "--cached")
+                                  "index"
+                                "working tree")))
+                     (if (member "-R" magit-buffer-diff-args)
+                         (format msg end magit-buffer-range)
+                       (format msg magit-buffer-range end))))
                (cond ((equal magit-buffer-typearg "--cached")
                       "Staged changes")
                      ((and (magit-repository-local-get 'this-commit-command)