Commit 983664c0 authored by Glenn Morris's avatar Glenn Morris

* version.el (emacs-repository-get-version): Avoid error if .git exists but

the git executable is not found.
parent 2a5bce4f
......@@ -4,6 +4,7 @@
Check either .bzr or .git, but not both.
Make the git case actually use the DIR argument, and return nil
rather than the empty string.
Avoid error if .git exists but the git executable is not found.
2014-01-22 Martin Rudalics <rudalics@gmx.at>
......
......@@ -185,8 +185,10 @@ only ask the VCS if we cannot find any information ourselves."
(message "Waiting for git...")
(with-temp-buffer
(let ((default-directory (file-name-as-directory dir)))
(and (zerop (call-process "git" nil '(t nil) nil "log"
"-1" "--pretty=format:%N"))
(and (eq 0
(ignore-errors
(call-process "git" nil '(t nil) nil "log"
"-1" "--pretty=format:%N")))
(not (zerop (buffer-size)))
(replace-regexp-in-string "\n" "" (buffer-string))))))))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment