unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Ulrich Mueller <ulm@gentoo.org>
To: 19049@debbugs.gnu.org
Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git
Date: Thu, 13 Nov 2014 23:44:04 +0100	[thread overview]
Message-ID: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> (raw)

The function tries to determine the version by calling:

   git log -1 --pretty=format:%N

According to git documentation, format:%N will output "commit notes"
which will be empty usually. Presumably, this should be format:%H, in
order to output the commit hash. Patch is included below.


From bbe5ea6655c85e15ca7a2538f0c12c03b46fed6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Thu, 13 Nov 2014 23:43:23 +0100
Subject: [PATCH] emacs-repository-get-version: Fix git argument.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 lisp/ChangeLog  | 5 +++++
 lisp/version.el | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c0ec99..e2276d2 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.
+
 2014-11-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/shr.el (shr-inhibit-images): Add a doc string.
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))))))))
-- 
2.1.3






             reply	other threads:[~2014-11-13 22:44 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-13 22:44 Ulrich Mueller [this message]
2014-11-14  4:01 ` bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Lars Magne Ingebrigtsen
2014-11-14  4:06   ` Lars Magne Ingebrigtsen
2014-11-14  7:19     ` Ulrich Mueller
2014-11-14  7:39       ` Eli Zaretskii
2014-11-14  8:07         ` Ulrich Mueller
2014-11-14  6:24   ` Eli Zaretskii
2014-11-14 14:12     ` Lars Magne Ingebrigtsen
2014-11-14 14:17       ` Dmitry Gutov
2014-11-14 14:22         ` Lars Magne Ingebrigtsen
2014-11-14 14:25         ` Lars Magne Ingebrigtsen
2014-11-14 14:37           ` Dmitry Gutov
2014-11-14 14:41             ` Lars Magne Ingebrigtsen
2014-11-14 14:52             ` Eli Zaretskii
2014-11-14 14:58               ` Dmitry Gutov
2014-11-14 15:06                 ` Eli Zaretskii
2014-11-14 14:52           ` Eli Zaretskii
2014-11-14 14:50         ` Eli Zaretskii
2014-11-14 14:47       ` Eli Zaretskii
2014-11-14 14:59         ` Lars Magne Ingebrigtsen
2014-11-14 15:11           ` Eli Zaretskii
2014-11-14 15:16             ` Lars Magne Ingebrigtsen
2014-11-14 15:23               ` Eli Zaretskii
2014-11-14 15:26                 ` 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

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=21605.13364.160424.795470@a1i15.kph.uni-mainz.de \
    --to=ulm@gentoo.org \
    --cc=19049@debbugs.gnu.org \
    /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 public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).