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

diff --git a/5c/35640a6607b1e8e4d032368195c3a525270520 b/5c/35640a6607b1e8e4d032368195c3a525270520
new file mode 100644 (file)
index 0000000..cbfedbb
--- /dev/null
+++ b/5c/35640a6607b1e8e4d032368195c3a525270520
@@ -0,0 +1,115 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 1AA02431FBF\r
+       for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 13:26:51 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.502\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.502 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, 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 YgfhF0Lha0xt for <notmuch@notmuchmail.org>;\r
+       Tue, 22 Apr 2014 13:26:47 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C6DCA431FBD\r
+       for <notmuch@notmuchmail.org>; Tue, 22 Apr 2014 13:26:46 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1WchH3-00081x-B3; Tue, 22 Apr 2014 21:26:41 +0100\r
+Received: from 5751dfa2.skybroadband.com ([87.81.223.162] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1WchH2-0002f2-Tu; Tue, 22 Apr 2014 21:26:37 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: 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: <1398179984-29531-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1398179984-29531-1-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Tue, 22 Apr 2014 21:26:29 +0100\r
+Message-ID: <87zjjdaz62.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 87.81.223.162\r
+X-QM-Geographic: According to ripencc,\r
+       this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 2a648d4bf92f629e37d43a18278728bb (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored 0.0 points. Summary of the scoring: \r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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 20:26:51 -0000\r
+\r
+\r
+LGTM +1\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