branch: elpa/magit
commit f3bf68e1e670e7ed3cc34088cea5da952fb30668
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-file-relative-name: Reorder conditions
Check whether we are in a repository before checking whether the file
is being tracked in the current repository.
Do not needlessly make the file name relative while doing the latter.
---
lisp/magit-git.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index d8d9343de50..41b4e83d94c 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -1043,11 +1043,11 @@ tracked file."
(magit-buffer-file-name)
(and (derived-mode-p 'dired-mode)
default-directory)))
- (_(or (not tracked)
- (magit-file-tracked-p (file-relative-name file))))
(dir (magit-toplevel
(magit--safe-default-directory
- (directory-file-name (file-name-directory file))))))
+ (directory-file-name (file-name-directory file)))))
+ (_(or (not tracked)
+ (magit-file-tracked-p file))))
(file-relative-name file dir))))
(defun magit-file-ignored-p (file)
