summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/version.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33777c5afa4..ce4221f7795 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-10 Glenn Morris <rgm@gnu.org>
* startup.el (command-line): Handle nil elements in load-path.
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))))))))