Re: [PATCH 1/1] building from git: use --abbrev=7 for version string

diff --git a/c2/722d66a2c2aca9fc2000ed2658a41e30f06aed b/c2/722d66a2c2aca9fc2000ed2658a41e30f06aed
new file mode 100644 (file)
index 0000000..b13ddbf
--- /dev/null
+++ b/c2/722d66a2c2aca9fc2000ed2658a41e30f06aed
@@ -0,0 +1,127 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id A0F6A431FBF\r
+       for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 14:03:29 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id Y1bx3TS0V5iR for <notmuch@notmuchmail.org>;\r
+       Tue, 22 Apr 2014 14:03:21 -0700 (PDT)\r
+Received: from mail-ee0-f44.google.com (mail-ee0-f44.google.com\r
+ [74.125.83.44])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 8D255431FBD   for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 14:03:21 -0700\r
+ (PDT)\r
+Received: by mail-ee0-f44.google.com with SMTP id e49so118770eek.31\r
+       for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 14:03:19 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:in-reply-to:references\r
+       :user-agent:date:message-id:mime-version:content-type;\r
+       bh=ymNgxO4OSS2dFv2+7WAO3P+UPQ91MCGXurAor39WSKQ=;\r
+       b=aSB4NyWsrzHQTcqLNd3CvRbrP0CmnEB441BSVcqUVjGr6w+jjuqfP1im1UWk3u/tHB\r
+       8euP2+/j0MWXAehtd66vWss3MYxJe8gN6dZsILoclkuL+5s3vh0ybNM/iEIy4oBho/An\r
+       7rwdyIj0E3pFm/VYLz6N4k9ZlaIl//wJOVL2ys7MmsBtahtyPh51INi+gq16ZKmEK8l9\r
+       N4HR9akNiaXrUAkKE0EJCYfO/HHhD9Q7x9X3ndPxF5mn7j4+/XtfsXQucVZjT5LBhPL9\r
+       PmelzOPahDQFEvZrZsbXYC1GIgh+WNsxn9QdpWSNV/fWWscfT4h98s2ElXy947ehrP2y\r
+       3jYw==\r
+X-Gm-Message-State:\r
+ ALoCoQnMUcF4dNqtwZSw9y7/wLXeNLCJnJo0f/hW8SJIHnUy7BLeb18UwApgG0BOxFtn5igaQ6KB\r
+X-Received: by 10.14.100.69 with SMTP id y45mr5021249eef.108.1398200599084;\r
+       Tue, 22 Apr 2014 14:03:19 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id l42sm19380eew.19.2014.04.22.14.03.17\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Tue, 22 Apr 2014 14:03:18 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Mark Walters <markwalters1009@gmail.com>,\r
+ Tomi Ollila <tomi.ollila@iki.fi>,     notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/1] building from git: use --abbrev=7 for version string\r
+In-Reply-To: <87zjjdaz62.fsf@qmul.ac.uk>\r
+References: <1398179984-29531-1-git-send-email-tomi.ollila@iki.fi>\r
+       <87zjjdaz62.fsf@qmul.ac.uk>\r
+User-Agent: Notmuch/0.18~rc0+1~g40dc79d (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Wed, 23 Apr 2014 00:03:16 +0300\r
+Message-ID: <871twphyaz.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 22 Apr 2014 21:03:29 -0000\r
+\r
+On Tue, 22 Apr 2014, Mark Walters <markwalters1009@gmail.com> wrote:\r
+> LGTM +1\r
+\r
+Looks good, and fixes the problem for me.\r
+\r
+BR,\r
+Jani.\r
+\r
+>\r
+> MW\r
+>\r
+> On Tue, 22 Apr 2014, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+>> Users may have set core.abbrev=n, where n != 7 in their git config\r
+>> file(s) which would give them different than expected version strings\r
+>> when building notmuch from git. This fixes the commit hash part of\r
+>> version string to 7 hexadecimal values.\r
+>> ---\r
+>>\r
+>> tested with:\r
+>> git config core.abbrev 12\r
+>> git describe\r
+>> rm version.stamp\r
+>> make\r
+>> cat version.stamp\r
+>> git reset --hard origin/master\r
+>> make\r
+>> cat version.stamp\r
+>>\r
+>> .local | 2 +-\r
+>>  1 file changed, 1 insertion(+), 1 deletion(-)\r
+>>\r
+>> diff --git a/Makefile.local b/Makefile.local\r
+>> index 877a979..6e78368 100644\r
+>> --- a/Makefile.local\r
+>> +++ b/Makefile.local\r
+>> @@ -21,7 +21,7 @@ endif\r
+>>  VERSION:=$(shell cat ${srcdir}/version)\r
+>>  ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)\r
+>>  ifeq ($(IS_GIT),yes)\r
+>> -VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)\r
+>> +VERSION:=$(shell git describe --abbrev=7 --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)\r
+>>  # Write the file 'version.stamp' in case its contents differ from $(VERSION)\r
+>>  FILE_VERSION:=$(shell test -f version.stamp && read vs < version.stamp || vs=; echo $$vs)\r
+>>  ifneq ($(FILE_VERSION),$(VERSION))\r
+>> -- \r
+>> 1.9.0\r
+>>\r
+>> _______________________________________________\r
+>> notmuch mailing list\r
+>> notmuch@notmuchmail.org\r
+>> http://notmuchmail.org/mailman/listinfo/notmuch\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r