1 Return-Path: <jani@nikula.org>
\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 A0F6A431FBF
\r
6 for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 14:03:29 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Y1bx3TS0V5iR for <notmuch@notmuchmail.org>;
\r
16 Tue, 22 Apr 2014 14:03:21 -0700 (PDT)
\r
17 Received: from mail-ee0-f44.google.com (mail-ee0-f44.google.com
\r
18 [74.125.83.44]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
19 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
20 8D255431FBD for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 14:03:21 -0700
\r
22 Received: by mail-ee0-f44.google.com with SMTP id e49so118770eek.31
\r
23 for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 14:03:19 -0700 (PDT)
\r
24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=1e100.net; s=20130820;
\r
26 h=x-gm-message-state:from:to:cc:subject:in-reply-to:references
\r
27 :user-agent:date:message-id:mime-version:content-type;
\r
28 bh=ymNgxO4OSS2dFv2+7WAO3P+UPQ91MCGXurAor39WSKQ=;
\r
29 b=aSB4NyWsrzHQTcqLNd3CvRbrP0CmnEB441BSVcqUVjGr6w+jjuqfP1im1UWk3u/tHB
\r
30 8euP2+/j0MWXAehtd66vWss3MYxJe8gN6dZsILoclkuL+5s3vh0ybNM/iEIy4oBho/An
\r
31 7rwdyIj0E3pFm/VYLz6N4k9ZlaIl//wJOVL2ys7MmsBtahtyPh51INi+gq16ZKmEK8l9
\r
32 N4HR9akNiaXrUAkKE0EJCYfO/HHhD9Q7x9X3ndPxF5mn7j4+/XtfsXQucVZjT5LBhPL9
\r
33 PmelzOPahDQFEvZrZsbXYC1GIgh+WNsxn9QdpWSNV/fWWscfT4h98s2ElXy947ehrP2y
\r
36 ALoCoQnMUcF4dNqtwZSw9y7/wLXeNLCJnJo0f/hW8SJIHnUy7BLeb18UwApgG0BOxFtn5igaQ6KB
\r
37 X-Received: by 10.14.100.69 with SMTP id y45mr5021249eef.108.1398200599084;
\r
38 Tue, 22 Apr 2014 14:03:19 -0700 (PDT)
\r
39 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.
\r
41 by mx.google.com with ESMTPSA id l42sm19380eew.19.2014.04.22.14.03.17
\r
42 for <multiple recipients>
\r
43 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
44 Tue, 22 Apr 2014 14:03:18 -0700 (PDT)
\r
45 From: Jani Nikula <jani@nikula.org>
\r
46 To: Mark Walters <markwalters1009@gmail.com>,
\r
47 Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org
\r
48 Subject: Re: [PATCH 1/1] building from git: use --abbrev=7 for version string
\r
49 In-Reply-To: <87zjjdaz62.fsf@qmul.ac.uk>
\r
50 References: <1398179984-29531-1-git-send-email-tomi.ollila@iki.fi>
\r
51 <87zjjdaz62.fsf@qmul.ac.uk>
\r
52 User-Agent: Notmuch/0.18~rc0+1~g40dc79d (http://notmuchmail.org) Emacs/24.3.1
\r
53 (x86_64-pc-linux-gnu)
\r
54 Date: Wed, 23 Apr 2014 00:03:16 +0300
\r
55 Message-ID: <871twphyaz.fsf@nikula.org>
\r
57 Content-Type: text/plain
\r
58 Cc: tomi.ollila@iki.fi
\r
59 X-BeenThere: notmuch@notmuchmail.org
\r
60 X-Mailman-Version: 2.1.13
\r
62 List-Id: "Use and development of the notmuch mail system."
\r
63 <notmuch.notmuchmail.org>
\r
64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
67 List-Post: <mailto:notmuch@notmuchmail.org>
\r
68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
70 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
71 X-List-Received-Date: Tue, 22 Apr 2014 21:03:29 -0000
\r
73 On Tue, 22 Apr 2014, Mark Walters <markwalters1009@gmail.com> wrote:
\r
76 Looks good, and fixes the problem for me.
\r
84 > On Tue, 22 Apr 2014, Tomi Ollila <tomi.ollila@iki.fi> wrote:
\r
85 >> Users may have set core.abbrev=n, where n != 7 in their git config
\r
86 >> file(s) which would give them different than expected version strings
\r
87 >> when building notmuch from git. This fixes the commit hash part of
\r
88 >> version string to 7 hexadecimal values.
\r
92 >> git config core.abbrev 12
\r
96 >> cat version.stamp
\r
97 >> git reset --hard origin/master
\r
99 >> cat version.stamp
\r
102 >> 1 file changed, 1 insertion(+), 1 deletion(-)
\r
104 >> diff --git a/Makefile.local b/Makefile.local
\r
105 >> index 877a979..6e78368 100644
\r
106 >> --- a/Makefile.local
\r
107 >> +++ b/Makefile.local
\r
108 >> @@ -21,7 +21,7 @@ endif
\r
109 >> VERSION:=$(shell cat ${srcdir}/version)
\r
110 >> ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
\r
111 >> ifeq ($(IS_GIT),yes)
\r
112 >> -VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
\r
113 >> +VERSION:=$(shell git describe --abbrev=7 --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
\r
114 >> # Write the file 'version.stamp' in case its contents differ from $(VERSION)
\r
115 >> FILE_VERSION:=$(shell test -f version.stamp && read vs < version.stamp || vs=; echo $$vs)
\r
116 >> ifneq ($(FILE_VERSION),$(VERSION))
\r
120 >> _______________________________________________
\r
121 >> notmuch mailing list
\r
122 >> notmuch@notmuchmail.org
\r
123 >> http://notmuchmail.org/mailman/listinfo/notmuch
\r
124 > _______________________________________________
\r
125 > notmuch mailing list
\r
126 > notmuch@notmuchmail.org
\r
127 > http://notmuchmail.org/mailman/listinfo/notmuch
\r