diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-06-14 16:33:05 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-06-14 16:33:05 -0700 |
| commit | 1f9974ad837b0ae3967dd126789ee7f7b04da8f9 (patch) | |
| tree | 5a5e3222ff07483066b21d5e45329ff5d11fccc8 /lisp/version.el | |
| parent | 3881af45bf104f54a851dc84becd0a6f744839c3 (diff) | |
| download | emacs-1f9974ad837b0ae3967dd126789ee7f7b04da8f9.tar.gz | |
* lisp/version.el (emacs-repository-version-git): Demote errors.
Check result is a hash.
Diffstat (limited to 'lisp/version.el')
| -rw-r--r-- | lisp/version.el | 7 |
1 files changed, 4 insertions, 3 deletions
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'." |