From: Glenn Morris <rgm@gnu.org>
Date: Sun, 14 Jun 2015 23:33:05 +0000 (-0700)
Subject: * lisp/version.el (emacs-repository-version-git): Demote errors.
X-Git-Tag: emacs-25.0.90~1765
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f9974ad837b0ae3967dd126789ee7f7b04da8f9;p=emacs.git

* lisp/version.el (emacs-repository-version-git): Demote errors.

Check result is a hash.
---

diff --git a/lisp/version.el b/lisp/version.el
index 112611d1083..c0b975ed31b 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -106,10 +106,11 @@ or if we could not determine the revision.")
   (with-temp-buffer
     (let ((default-directory (file-name-as-directory dir)))
       (and (eq 0
-	       (ignore-errors
+	       (with-demoted-errors "Error running git rev-parse: %S"
 		 (call-process "git" nil '(t nil) nil "rev-parse" "HEAD")))
-	   (not (zerop (buffer-size)))
-	   (replace-regexp-in-string "\n" "" (buffer-string))))))
+	   (progn (goto-char (point-min))
+		  (looking-at "[0-9a-fA-F]\\{40\\}"))
+	   (match-string 0)))))
 
 (defun emacs-repository--version-git-1 (file)
   "Internal subroutine of `emacs-repository-get-version'."