branch: elpa/git-commit
commit 0286d4937b97fe01952f7021654c4ac1c068a2bd
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Revert "Ignore magit-buffer-topdir when preparing another buffer"
This reverts commit 543efd16e78db356688736b3bfced42f9d215a56.
See next commit, also a revert.
---
lisp/magit-git.el | 7 ++-----
lisp/magit-mode.el | 4 ++--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 6f2edf5a2c..322beb3baa 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -980,11 +980,8 @@ returning the truename."
;; working tree.
(file-name-directory (directory-file-name gitdir))))))))))))
-(defun magit--toplevel-safe (&optional nocache)
- (or (if nocache
- (let ((magit-buffer-topdir nil))
- (magit-toplevel))
- (magit-toplevel))
+(defun magit--toplevel-safe ()
+ (or (magit-toplevel)
(magit--not-inside-repository-error)))
(defmacro magit-with-toplevel (&rest body)
diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el
index 88a1bb9c65..7c7b21a9ad 100644
--- a/lisp/magit-mode.el
+++ b/lisp/magit-mode.el
@@ -805,7 +805,7 @@ If `visible', then only consider buffers on all visible
frames.
If `selected' or t, then only consider buffers on the selected
frame.
If a frame, then only consider buffers on that frame."
- (let ((topdir (magit--toplevel-safe 'nocache)))
+ (let ((topdir (magit--toplevel-safe)))
(cl-flet* ((b (buffer)
(with-current-buffer buffer
(and (eq major-mode mode)
@@ -827,7 +827,7 @@ If a frame, then only consider buffers on that frame."
((guard (framep frame)) (seq-some #'w (window-list frame)))))))
(defun magit-generate-new-buffer (mode &optional value directory)
- (let* ((default-directory (or directory (magit--toplevel-safe 'nocache)))
+ (let* ((default-directory (or directory (magit--toplevel-safe)))
(name (funcall magit-generate-buffer-name-function mode value))
(buffer (generate-new-buffer name)))
(with-current-buffer buffer
