[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit 3ebc4e84db 07/10: magit-diff-refresh-buffer: Fi
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/git-commit 3ebc4e84db 07/10: magit-diff-refresh-buffer: Fix magit-set-header-line-format |
Date: |
Tue, 7 Jun 2022 10:58:26 -0400 (EDT) |
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)
- [nongnu] elpa/git-commit updated (9b48dd7e36 -> 2dfeaa6839), ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit e0abcbd22f 01/10: Change name of fake command used when adding --all argument, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit e400987d1f 05/10: Remove outdated commit-diff comment, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit 41b08daabf 08/10: magit-commit-diff-1: Determine arguments only here, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit c0f4e43c58 02/10: magit-commit-diff: Fix name of a supported command, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit f34913f669 06/10: magit-diff-refresh-buffer: Use nicer title while committing --all, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit 3af07129bc 09/10: magit-commit-diff: Remember commit command, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit 2dfeaa6839 10/10: magit-commit-diff-1: Use different heuristics, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit 34365a2c5c 03/10: magit-commit-assert: Use --all instead of explicitly staging all, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit c9a738f7d3 04/10: magit-commit-diff-1: New function, ELPA Syncer, 2022/06/07
- [nongnu] elpa/git-commit 3ebc4e84db 07/10: magit-diff-refresh-buffer: Fix magit-set-header-line-format,
ELPA Syncer <=