From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eric Hanchrow Newsgroups: gmane.emacs.devel Subject: [PATCH] Use %H instead of %N as our --pretty=format Date: Wed, 20 Aug 2014 12:23:01 -0700 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1408562641 12554 80.91.229.3 (20 Aug 2014 19:24:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 20 Aug 2014 19:24:01 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 20 21:23:53 2014 Return-path: Envelope-to: ged-emacs-devel@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 1XKBU7-0005PY-To for ged-emacs-devel@m.gmane.org; Wed, 20 Aug 2014 21:23:52 +0200 Original-Received: from localhost ([::1]:57203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKBU7-0007QR-Fu for ged-emacs-devel@m.gmane.org; Wed, 20 Aug 2014 15:23:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKBTm-0007MV-5w for emacs-devel@gnu.org; Wed, 20 Aug 2014 15:23:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKBTe-0004m3-Ux for emacs-devel@gnu.org; Wed, 20 Aug 2014 15:23:25 -0400 Original-Received: from mail-wg0-x22e.google.com ([2a00:1450:400c:c00::22e]:61530) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKBTe-0004lq-Of for emacs-devel@gnu.org; Wed, 20 Aug 2014 15:23:22 -0400 Original-Received: by mail-wg0-f46.google.com with SMTP id m15so8218857wgh.5 for ; Wed, 20 Aug 2014 12:23:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:content-type; bh=0Dx34ufrCJrTUgbQu0KTJokY8UNCI9ZG0Kp144cp9vM=; b=bZa0g7QuGeCElfZ0CmD0zy5+2DFejJgvM5zbz47fiqJ12BAf8PHNIVFpevJ101n1BD s3oSTpuKPk2BgqZmLLCtpOiC7T9nnfVz3KTH9HE5saGc3IN6js3cUlurPMw7h/1oHLm+ xQKOrMMKIOxaqKIgv/y3faKTJc2Pb8MNFMFrt1YnGyckJ96BlBrqPFvUbC0wwObSaz9d UkdKBxxm0l34wp1gBCFQU0iOYGQ4lH+GOEOCqF/QFmC1/YKQYuHc/TjOHG7lLNaSfu7r TVxeRAMmlyen1lSXQKPztfhT1lgF6d0vPfMYaC9QYn0t5Z6BydXVAA19J6D6K0m4cOUf Btwg== X-Received: by 10.194.222.230 with SMTP id qp6mr62365244wjc.23.1408562601416; Wed, 20 Aug 2014 12:23:21 -0700 (PDT) Original-Received: by 10.194.10.135 with HTTP; Wed, 20 Aug 2014 12:23:01 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:173782 Archived-At: %N displays "git notes", which we don't use; %H displays the commit hash, which is much more useful. I assume that the %N was a typo on esr's part. lisp/ChangeLog | 5 +++++ lisp/version.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dfc4ab7..893717b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-08-20 Eric Hanchrow + + * version.el (emacs-repository-get-version): Use %H instead of %N + as our "pretty" format spec. + 2014-08-18 Stefan Monnier * progmodes/python.el (python-shell-prompt-detect): Remove redundant 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.0