branch: elpa/git-commit
commit be549268313bdcc6008285312a4ac5367d3b4402
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Revert "magit-insert-revision-notes: Avoid having to cancel sections"
This reverts commit 71630e4db1ff69a8e2c13f112c21b26d8bddf1e6.
---
lisp/magit-diff.el | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index b0ac153557..90cc8ddadb 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -2723,17 +2723,20 @@ or a ref which is not a branch, then it inserts
nothing."
(defun magit-insert-revision-notes ()
"Insert commit notes into a revision buffer."
- (let ((default (or (magit-get "core.notesRef") "refs/notes/commits")))
+ (let* ((var "core.notesRef")
+ (def (or (magit-get var) "refs/notes/commits")))
(dolist (ref (magit-list-active-notes-refs))
- (when-let ((note (with-temp-buffer
- (magit-git-insert "-c" (concat "core.notesRef=" ref)
- "notes" "show"
magit-buffer-revision)
- (magit-revision--wash-message))))
- (magit-insert-section
- ( notes ref (not (equal ref default))
+ (magit-insert-section
+ ( notes ref (not (equal ref def))
:heading-highlight-face 'magit-diff-hunk-heading-highlight)
- (let ((beg (point)))
- (insert note)
+ (let ((beg (point))
+ (rev magit-buffer-revision))
+ (insert (with-temp-buffer
+ (magit-git-insert "-c" (concat "core.notesRef=" ref)
+ "notes" "show" rev)
+ (magit-revision--wash-message)))
+ (if (= (point) beg)
+ (magit-cancel-section)
(goto-char beg)
(end-of-line)
(insert (format " (%s)"
