Return-Path: <jani@nikula.org>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id A0F6A431FBF
	for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 14:03:29 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: -0.7
X-Spam-Level: 
X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
	tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id Y1bx3TS0V5iR for <notmuch@notmuchmail.org>;
	Tue, 22 Apr 2014 14:03:21 -0700 (PDT)
Received: from mail-ee0-f44.google.com (mail-ee0-f44.google.com
 [74.125.83.44])	(using TLSv1 with cipher RC4-SHA (128/128 bits))	(No client
 certificate requested)	by olra.theworths.org (Postfix) with ESMTPS id
 8D255431FBD	for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 14:03:21 -0700
 (PDT)
Received: by mail-ee0-f44.google.com with SMTP id e49so118770eek.31
	for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 14:03:19 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:from:to:cc:subject:in-reply-to:references
	:user-agent:date:message-id:mime-version:content-type;
	bh=ymNgxO4OSS2dFv2+7WAO3P+UPQ91MCGXurAor39WSKQ=;
	b=aSB4NyWsrzHQTcqLNd3CvRbrP0CmnEB441BSVcqUVjGr6w+jjuqfP1im1UWk3u/tHB
	8euP2+/j0MWXAehtd66vWss3MYxJe8gN6dZsILoclkuL+5s3vh0ybNM/iEIy4oBho/An
	7rwdyIj0E3pFm/VYLz6N4k9ZlaIl//wJOVL2ys7MmsBtahtyPh51INi+gq16ZKmEK8l9
	N4HR9akNiaXrUAkKE0EJCYfO/HHhD9Q7x9X3ndPxF5mn7j4+/XtfsXQucVZjT5LBhPL9
	PmelzOPahDQFEvZrZsbXYC1GIgh+WNsxn9QdpWSNV/fWWscfT4h98s2ElXy947ehrP2y
	3jYw==
X-Gm-Message-State:
 ALoCoQnMUcF4dNqtwZSw9y7/wLXeNLCJnJo0f/hW8SJIHnUy7BLeb18UwApgG0BOxFtn5igaQ6KB
X-Received: by 10.14.100.69 with SMTP id y45mr5021249eef.108.1398200599084;
	Tue, 22 Apr 2014 14:03:19 -0700 (PDT)
Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.
	[88.195.111.91])
	by mx.google.com with ESMTPSA id l42sm19380eew.19.2014.04.22.14.03.17
	for <multiple recipients>
	(version=TLSv1.2 cipher=RC4-SHA bits=128/128);
	Tue, 22 Apr 2014 14:03:18 -0700 (PDT)
From: Jani Nikula <jani@nikula.org>
To: Mark Walters <markwalters1009@gmail.com>,
 Tomi Ollila <tomi.ollila@iki.fi>,	notmuch@notmuchmail.org
Subject: Re: [PATCH 1/1] building from git: use --abbrev=7 for version string
In-Reply-To: <87zjjdaz62.fsf@qmul.ac.uk>
References: <1398179984-29531-1-git-send-email-tomi.ollila@iki.fi>
	<87zjjdaz62.fsf@qmul.ac.uk>
User-Agent: Notmuch/0.18~rc0+1~g40dc79d (http://notmuchmail.org) Emacs/24.3.1
	(x86_64-pc-linux-gnu)
Date: Wed, 23 Apr 2014 00:03:16 +0300
Message-ID: <871twphyaz.fsf@nikula.org>
MIME-Version: 1.0
Content-Type: text/plain
Cc: tomi.ollila@iki.fi
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2014 21:03:29 -0000

On Tue, 22 Apr 2014, Mark Walters <markwalters1009@gmail.com> wrote:
> LGTM +1

Looks good, and fixes the problem for me.

BR,
Jani.

>
> MW
>
> On Tue, 22 Apr 2014, Tomi Ollila <tomi.ollila@iki.fi> wrote:
>> Users may have set core.abbrev=n, where n != 7 in their git config
>> file(s) which would give them different than expected version strings
>> when building notmuch from git. This fixes the commit hash part of
>> version string to 7 hexadecimal values.
>> ---
>>
>> tested with:
>> git config core.abbrev 12
>> git describe
>> rm version.stamp
>> make
>> cat version.stamp
>> git reset --hard origin/master
>> make
>> cat version.stamp
>>
>> .local | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Makefile.local b/Makefile.local
>> index 877a979..6e78368 100644
>> --- a/Makefile.local
>> +++ b/Makefile.local
>> @@ -21,7 +21,7 @@ endif
>>  VERSION:=$(shell cat ${srcdir}/version)
>>  ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
>>  ifeq ($(IS_GIT),yes)
>> -VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
>> +VERSION:=$(shell git describe --abbrev=7 --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
>>  # Write the file 'version.stamp' in case its contents differ from $(VERSION)
>>  FILE_VERSION:=$(shell test -f version.stamp && read vs < version.stamp || vs=; echo $$vs)
>>  ifneq ($(FILE_VERSION),$(VERSION))
>> -- 
>> 1.9.0
>>
>> _______________________________________________
>> notmuch mailing list
>> notmuch@notmuchmail.org
>> http://notmuchmail.org/mailman/listinfo/notmuch
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch