From: Ulrich Müller <ulm@gentoo.org>
Date: Fri, 14 Nov 2014 04:03:32 +0000 (+0100)
Subject: (emacs-repository-get-version): Call `git log' with proper format argument
X-Git-Tag: emacs-25.0.90~2635^2~479
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7169391ddb735892a8463aa96407e0448a3820a0;p=emacs.git

(emacs-repository-get-version): Call `git log' with proper format argument

Fixes: debbugs:19049

* version.el (emacs-repository-get-version): Call `git log'
command with proper format argument (bug#19049).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8238dc5a36d..7674e78856c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-13  Ulrich Müller  <ulm@gentoo.org>
+
+	* version.el (emacs-repository-get-version): Call `git log'
+	command with proper format argument (bug#19049).
+
 2014-11-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* bindings.el (search-map): Bind M-s M-s to `eww-search-words'.
diff --git a/lisp/version.el b/lisp/version.el
index 68b502ce451..1ea38da9cae 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -188,7 +188,7 @@ only ask the VCS if we cannot find any information ourselves."
 	     (and (eq 0
 		      (condition-case nil
 			  (call-process "git" nil '(t nil) nil "log"
-					"-1" "--pretty=format:%N")
+					"-1" "--pretty=format:%H")
 			(error nil)))
 		  (not (zerop (buffer-size)))
 		  (replace-regexp-in-string "\n" "" (buffer-string))))))))