1 Return-Path: <m.walters@qmul.ac.uk>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 1AA02431FBF
\r
6 for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 13:26:51 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.502 tagged_above=-999 required=5
\r
12 tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,
\r
13 NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id YgfhF0Lha0xt for <notmuch@notmuchmail.org>;
\r
17 Tue, 22 Apr 2014 13:26:47 -0700 (PDT)
\r
18 Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])
\r
19 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id C6DCA431FBD
\r
22 for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 13:26:46 -0700 (PDT)
\r
23 Received: from smtp.qmul.ac.uk ([138.37.6.40])
\r
24 by mail2.qmul.ac.uk with esmtp (Exim 4.71)
\r
25 (envelope-from <m.walters@qmul.ac.uk>)
\r
26 id 1WchH3-00081x-B3; Tue, 22 Apr 2014 21:26:41 +0100
\r
27 Received: from 5751dfa2.skybroadband.com ([87.81.223.162] helo=localhost)
\r
28 by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)
\r
29 (envelope-from <m.walters@qmul.ac.uk>)
\r
30 id 1WchH2-0002f2-Tu; Tue, 22 Apr 2014 21:26:37 +0100
\r
31 From: Mark Walters <markwalters1009@gmail.com>
\r
32 To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org
\r
33 Subject: Re: [PATCH 1/1] building from git: use --abbrev=7 for version string
\r
34 In-Reply-To: <1398179984-29531-1-git-send-email-tomi.ollila@iki.fi>
\r
35 References: <1398179984-29531-1-git-send-email-tomi.ollila@iki.fi>
\r
36 User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1
\r
37 (x86_64-pc-linux-gnu)
\r
38 Date: Tue, 22 Apr 2014 21:26:29 +0100
\r
39 Message-ID: <87zjjdaz62.fsf@qmul.ac.uk>
\r
41 Content-Type: text/plain; charset=us-ascii
\r
42 X-Sender-Host-Address: 87.81.223.162
\r
43 X-QM-Geographic: According to ripencc,
\r
44 this message was delivered by a machine in Britain (UK) (GB).
\r
45 X-QM-SPAM-Info: Sender has good ham record. :)
\r
46 X-QM-Body-MD5: 2a648d4bf92f629e37d43a18278728bb (of first 20000 bytes)
\r
47 X-SpamAssassin-Score: 0.0
\r
48 X-SpamAssassin-SpamBar: /
\r
49 X-SpamAssassin-Report: The QM spam filters have analysed this message to
\r
51 spam. We require at least 5.0 points to mark a message as spam.
\r
52 This message scored 0.0 points. Summary of the scoring:
\r
53 * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
\r
54 provider * (markwalters1009[at]gmail.com)
\r
55 X-QM-Scan-Virus: ClamAV says the message is clean
\r
56 Cc: tomi.ollila@iki.fi
\r
57 X-BeenThere: notmuch@notmuchmail.org
\r
58 X-Mailman-Version: 2.1.13
\r
60 List-Id: "Use and development of the notmuch mail system."
\r
61 <notmuch.notmuchmail.org>
\r
62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
63 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
65 List-Post: <mailto:notmuch@notmuchmail.org>
\r
66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
69 X-List-Received-Date: Tue, 22 Apr 2014 20:26:51 -0000
\r
76 On Tue, 22 Apr 2014, Tomi Ollila <tomi.ollila@iki.fi> wrote:
\r
77 > Users may have set core.abbrev=n, where n != 7 in their git config
\r
78 > file(s) which would give them different than expected version strings
\r
79 > when building notmuch from git. This fixes the commit hash part of
\r
80 > version string to 7 hexadecimal values.
\r
84 > git config core.abbrev 12
\r
89 > git reset --hard origin/master
\r
94 > 1 file changed, 1 insertion(+), 1 deletion(-)
\r
96 > diff --git a/Makefile.local b/Makefile.local
\r
97 > index 877a979..6e78368 100644
\r
98 > --- a/Makefile.local
\r
99 > +++ b/Makefile.local
\r
100 > @@ -21,7 +21,7 @@ endif
\r
101 > VERSION:=$(shell cat ${srcdir}/version)
\r
102 > ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
\r
103 > ifeq ($(IS_GIT),yes)
\r
104 > -VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
\r
105 > +VERSION:=$(shell git describe --abbrev=7 --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
\r
106 > # Write the file 'version.stamp' in case its contents differ from $(VERSION)
\r
107 > FILE_VERSION:=$(shell test -f version.stamp && read vs < version.stamp || vs=; echo $$vs)
\r
108 > ifneq ($(FILE_VERSION),$(VERSION))
\r
112 > _______________________________________________
\r
113 > notmuch mailing list
\r
114 > notmuch@notmuchmail.org
\r
115 > http://notmuchmail.org/mailman/listinfo/notmuch
\r