diff options
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/version.el | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1d957de8ba8..622da8cf3e8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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> diff --git a/lisp/version.el b/lisp/version.el index d1d6c4c216b..1a3265b55b2 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -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)))))))) |