branch: elpa/git-commit
commit 4d1d00e6fa03bde6d51cbd5bb4dd2442531ad63f
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Fix finding remote executables
---
lisp/magit-autorevert.el | 6 +-----
lisp/magit-commit.el | 4 ++--
lisp/magit-git.el | 2 +-
lisp/magit-log.el | 2 +-
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/lisp/magit-autorevert.el b/lisp/magit-autorevert.el
index 39b1c02fe8..b40d44cdd6 100644
--- a/lisp/magit-autorevert.el
+++ b/lisp/magit-autorevert.el
@@ -109,11 +109,7 @@ seconds of user inactivity. That is not desirable."
(not global-auto-revert-mode) ; see #3460
buffer-file-name
(file-readable-p buffer-file-name)
- (or (< emacs-major-version 27)
- (with-no-warnings
- (condition-case nil
- (executable-find magit-git-executable t) ; see #3684
- (wrong-number-of-arguments t)))) ; very old 27 built
+ (compat-executable-find (magit-git-executable) t)
(magit-toplevel)
(or (not magit-auto-revert-tracked-only)
(magit-file-tracked-p buffer-file-name)))
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index a5d4943cfb..3309618773 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -517,7 +517,7 @@ See `magit-commit-autofixup' for an alternative
implementation."
(transient-args 'magit-commit-absorb))))
(if (eq phase 'transient)
(transient-setup 'magit-commit-absorb)
- (unless (executable-find "git-absorb")
+ (unless (compat-executable-find "git-absorb" t)
(user-error "This command requires the git-absorb executable, which %s"
"is available from https://github.com/tummychow/git-absorb";))
(unless (magit-anything-staged-p)
@@ -560,7 +560,7 @@ See `magit-commit-absorb' for an alternative
implementation."
(transient-args 'magit-commit-autofixup))))
(if (eq phase 'transient)
(transient-setup 'magit-commit-autofixup)
- (unless (executable-find "git-autofixup")
+ (unless (compat-executable-find "git-autofixup" t)
(user-error "This command requires the git-autofixup script, which %s"
"is available from
https://github.com/torbiak/git-autofixup";))
(unless (magit-anything-modified-p)
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 4a14ced045..367a1dfd98 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -926,7 +926,7 @@ returning the truename."
"Git executable cannot be found (see https://magit.vc/goto/e6a78ed2)")
(defun magit--assert-usable-git ()
- (if (not (executable-find (magit-git-executable)))
+ (if (not (compat-executable-find (magit-git-executable) t))
(signal 'magit-git-executable-not-found (magit-git-executable))
(let ((magit-git-debug
(lambda (err)
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 659f202355..2763a1d949 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -821,7 +821,7 @@ https://github.com/mhagger/git-when-merged.";
(list commit
(magit-read-other-branch "Merged into" commit)))
(magit-log-arguments)))
- (unless (executable-find "git-when-merged")
+ (unless (compat-executable-find "git-when-merged" t)
(user-error "This command requires git-when-merged (%s)"
"https://github.com/mhagger/git-when-merged";))
(let (exit m)
