From: Eli Zaretskii <eliz@gnu.org>
To: Fabrice Popineau <fabrice.popineau@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: emacs-repository-version on MS-Windows
Date: Sat, 15 Nov 2014 15:01:57 +0200 [thread overview]
Message-ID: <83fvdkfwhm.fsf@gnu.org> (raw)
In-Reply-To: <CAFgFV9N99SSp5pWuhBKg2g49JvzufX1uLjrHyJN2Aa7R64zh=A@mail.gmail.com>
> From: Fabrice Popineau <fabrice.popineau@gmail.com>
> Date: Sat, 15 Nov 2014 12:58:17 +0100
> Cc: Emacs developers <emacs-devel@gnu.org>
>
> 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 <ulm@gentoo.org>
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 <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 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))))))))
next prev parent reply other threads:[~2014-11-15 13:01 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-14 9:32 emacs-repository-version on MS-Windows Eli Zaretskii
2014-11-14 9:40 ` Eli Zaretskii
2014-11-14 9:48 ` Chris Zheng
2014-11-14 10:13 ` Eli Zaretskii
2014-11-14 10:53 ` Chris Zheng
2014-11-14 14:13 ` Eli Zaretskii
2014-11-15 11:27 ` Fabrice Popineau
2014-11-15 11:39 ` Eli Zaretskii
2014-11-15 11:58 ` Fabrice Popineau
2014-11-15 12:57 ` Fabrice Popineau
2014-11-15 13:01 ` Eli Zaretskii [this message]
2014-11-14 9:57 ` martin rudalics
2014-11-14 10:14 ` Eli Zaretskii
2014-11-14 10:57 ` Dani Moncayo
2014-11-14 14:15 ` Eli Zaretskii
2014-11-15 20:20 ` Eli Zaretskii
2014-11-15 21:44 ` Glenn Morris
2014-11-15 22:42 ` Andreas Schwab
2014-11-16 16:03 ` Eli Zaretskii
2014-11-16 16:27 ` David Kastrup
2014-11-16 17:56 ` Eli Zaretskii
2014-11-16 18:26 ` David Kastrup
2014-11-16 16:33 ` Andreas Schwab
2014-11-16 18:00 ` Eli Zaretskii
2014-11-16 18:15 ` Eli Zaretskii
2014-11-16 16:47 ` Achim Gratz
2014-11-16 18:05 ` Eli Zaretskii
2014-11-16 23:41 ` Andy Moreton
2014-11-17 3:45 ` Eli Zaretskii
2014-11-16 19:30 ` Glenn Morris
2014-11-16 3:40 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83fvdkfwhm.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=fabrice.popineau@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.