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

[Jani Nikula]

On Tue, 22 Apr 2014, Mark Walters <markwalters1009 at 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 at 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 at notmuchmail.org
>> http://notmuchmail.org/mailman/listinfo/notmuch
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch