[Emacs-diffs] [emacs] 01/01: (emacs-repository-get-version): Call `git log' with proper format argument

[Lars Ingebrigtsen]

larsi pushed a commit to branch emacs-24
in repository emacs.

commit df33e85a807656a13b3020d8f65d5da728bb808e
Author: Ulrich Müller <address@hidden>
Date:   Fri Nov 14 05:03:32 2014 +0100

    (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).
---
 lisp/ChangeLog  |    5 +++++
 lisp/version.el |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33777c5..ce4221f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-13  Ulrich Müller  <address@hidden>
+
+       * version.el (emacs-repository-get-version): Call `git log'
+       command with proper format argument (bug#19049).
+
 2014-11-10  Glenn Morris  <address@hidden>
 
        * startup.el (command-line): Handle nil elements in load-path.
diff --git a/lisp/version.el b/lisp/version.el
index 68b502c..1ea38da 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))))))))