Re: emacs-repository-version on MS-Windows

[Eli Zaretskii]

> From: Fabrice Popineau <address@hidden>
> Date: Sat, 15 Nov 2014 12:58:17 +0100
> Cc: Emacs developers <address@hidden>
> 
>     What does this show in the master branch after you "git pull":
>     
>     git rev-parse HEAD
>     
>     
> 
> git rev-parse HEAD
> 658b768a6534ae6e77a8547a56fc31b46b63710b

This is the latest commit on master.  So you should have the change
below, which switched the git command used in
emacs-repository-get-version to use %H instead of %N.  Do you have
that change?  If so, how come your Emacs still uses %N?

$ git show 7169391^..7169391
commit 7169391ddb735892a8463aa96407e0448a3820a0
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).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8238dc5..7674e78 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-14  Lars Magne Ingebrigtsen  <address@hidden>

        * bindings.el (search-map): Bind M-s M-s to `eww-search-words'.
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))))))))