[Emacs-diffs] trunk r116111: * version.el (emacs-repository-get-version): Avoid error if .git exists but

[Glenn Morris]

------------------------------------------------------------
revno: 116111
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-01-22 09:34:27 -0800
message:
  * version.el (emacs-repository-get-version): Avoid error if .git exists but
  the git executable is not found.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/version.el                version.el-20091113204419-o5vbwnq5f7feedwu-1613

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-22 17:26:14 +0000
+++ b/lisp/ChangeLog    2014-01-22 17:34:27 +0000
@@ -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  <address@hidden>
 

=== modified file 'lisp/version.el'
--- a/lisp/version.el   2014-01-22 17:26:14 +0000
+++ b/lisp/version.el   2014-01-22 17:34:27 +0000
@@ -185,8 +185,10 @@
         (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))))))))