procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Tramp version check more robust

Browse source 
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Check for "git" executable.
This commit is contained in:
Michael Albinus 2022-06-08 12:42:10 +02:00
parent 7f778c6943
commit 768ed1476a
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/net/trampver.el
View file

@ -58,6 +58,7 @@
;; `emacs-repository-get-branch' has been introduced with Emacs 27.1. ;; `emacs-repository-get-branch' has been introduced with Emacs 27.1.
(with-no-warnings (with-no-warnings
(and (stringp dir) (file-directory-p dir) (and (stringp dir) (file-directory-p dir)
(executable-find "git")
(emacs-repository-get-branch dir))))) (emacs-repository-get-branch dir)))))
"The repository branch of the Tramp sources.") "The repository branch of the Tramp sources.")
@ -70,6 +71,7 @@
(dir (or (locate-dominating-file (locate-library "tramp") ".git") (dir (or (locate-dominating-file (locate-library "tramp") ".git")
source-directory))) source-directory)))
(and (stringp dir) (file-directory-p dir) (and (stringp dir) (file-directory-p dir)
(executable-find "git")
(emacs-repository-get-version dir)))) (emacs-repository-get-version dir))))
"The repository revision of the Tramp sources.") "The repository revision of the Tramp sources.")