From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ulrich Mueller Newsgroups: gmane.emacs.bugs Subject: bug#19049: 25.0.50; emacs-repository-get-version doesn't work with git Date: Thu, 13 Nov 2014 23:44:04 +0100 Message-ID: <21605.13364.160424.795470@a1i15.kph.uni-mainz.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1415918728 13594 80.91.229.3 (13 Nov 2014 22:45:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 13 Nov 2014 22:45:28 +0000 (UTC) To: 19049@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Nov 13 23:45:21 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xp38i-0003lf-E2 for geb-bug-gnu-emacs@m.gmane.org; Thu, 13 Nov 2014 23:45:20 +0100 Original-Received: from localhost ([::1]:34199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp38i-0001tc-4F for geb-bug-gnu-emacs@m.gmane.org; Thu, 13 Nov 2014 17:45:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp38Y-0001tW-Bp for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 17:45:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xp38R-0004bK-7D for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 17:45:10 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34464) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp38Q-0004ap-Tw for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 17:45:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Xp38Q-0008D7-FO for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 17:45:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Ulrich Mueller Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 13 Nov 2014 22:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19049 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.141591868831513 (code B ref -1); Thu, 13 Nov 2014 22:45:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Nov 2014 22:44:48 +0000 Original-Received: from localhost ([127.0.0.1]:59910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xp388-0008C9-Ky for submit@debbugs.gnu.org; Thu, 13 Nov 2014 17:44:48 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:54076) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xp383-0008Bw-Bb for submit@debbugs.gnu.org; Thu, 13 Nov 2014 17:44:43 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xp37v-0004Vw-Vd for submit@debbugs.gnu.org; Thu, 13 Nov 2014 17:44:39 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:46151) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp37v-0004Vs-TM for submit@debbugs.gnu.org; Thu, 13 Nov 2014 17:44:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp37p-0001oZ-18 for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 17:44:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xp37h-0004UB-UI for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 17:44:24 -0500 Original-Received: from a1www.kph.uni-mainz.de ([134.93.134.1]:46296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xp37h-0004Sz-Ox for bug-gnu-emacs@gnu.org; Thu, 13 Nov 2014 17:44:17 -0500 Original-Received: from a1i15.kph.uni-mainz.de (a1i15.kph.uni-mainz.de [134.93.134.92]) by a1www.kph.uni-mainz.de (8.14.9/8.14.7) with ESMTP id sADMi4do020369 for ; Thu, 13 Nov 2014 23:44:04 +0100 Original-Received: from a1i15.kph.uni-mainz.de (localhost [127.0.0.1]) by a1i15.kph.uni-mainz.de (8.14.8/8.14.2) with ESMTP id sADMi4Zn029436; Thu, 13 Nov 2014 23:44:04 +0100 Original-Received: (from ulm@localhost) by a1i15.kph.uni-mainz.de (8.14.8/8.14.8/Submit) id sADMi4Do029432; Thu, 13 Nov 2014 23:44:04 +0100 X-Mailer: VM 8.2.0b under 24.3.1 (x86_64-pc-linux-gnu) X-MIME-Autoconverted: from 8bit to quoted-printable by a1www.kph.uni-mainz.de id sADMi4do020369 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:95963 The function tries to determine the version by calling: git log -1 --pretty=3Dformat:%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: =3D?UTF-8?q?Ulrich=3D20M=3DC3=3DBCller?=3D 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=3DUTF-8 Content-Transfer-Encoding: 8bit * version.el (emacs-repository-get-version): Call `git log' command with proper format argument. Signed-off-by: Ulrich M=FCller --- 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=FCller + + * version.el (emacs-repository-get-version): Call `git log' + command with proper format argument. + 2014-11-13 Lars Magne Ingebrigtsen =20 * 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 ou= rselves." (and (eq 0 (condition-case nil (call-process "git" nil '(t nil) nil "log" - "-1" "--pretty=3Dformat:%N") + "-1" "--pretty=3Dformat:%H") (error nil))) (not (zerop (buffer-size))) (replace-regexp-in-string "\n" "" (buffer-string)))))))) --=20 2.1.3