From: David Bremner <david@tethera.net>
Date: Sat, 3 May 2014 23:32:05 +0000 (+0900)
Subject: Merge tag '0.18_rc1'
X-Git-Tag: 0.19_rc1~170
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=21cb851a22f41e0b2a7c07dcbcc4f2dec20a0e3d;hp=55354534953fd631ae1f51cf0f46732f00fde9c2

Merge tag '0.18_rc1'

notmuch 0.18~rc1 release
---

diff --git a/Makefile.local b/Makefile.local
index 086b5a11..fa07d81b 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))
diff --git a/doc/.gitignore b/doc/.gitignore
index a60fb31e..f0cbb9c2 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,2 +1,3 @@
+*.pyc
 docdeps.mk
 _build
diff --git a/test/.gitignore b/test/.gitignore
index 97e02487..4081cee6 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,9 +1,11 @@
-test-results
-corpus.mail
-smtp-dummy
-symbol-test
 arg-test
+corpus.mail
+have-compact
+have-man
 hex-xcode
-random-corpus
 parse-time
+random-corpus
+smtp-dummy
+symbol-test
+test-results
 tmp.*