From: Mark Walters <markwalters1009@gmail.com>
To: 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: <1398179984-29531-1-git-send-email-tomi.ollila@iki.fi>
References: <1398179984-29531-1-git-send-email-tomi.ollila@iki.fi>
User-Agent: Notmuch/0.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1
	(x86_64-pc-linux-gnu)
Date: Tue, 22 Apr 2014 21:26:29 +0100
Message-ID: <87zjjdaz62.fsf@qmul.ac.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: tomi.ollila@iki.fi
Precedence: list


LGTM +1

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