Revert "notmuch.el: 'F' in search mode takes us to a list of folders."

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 8207228476c2ab4cf0f7b7df0dd8919fef7da757..e112072743960951f3896f7b2944e4a11951cc91 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -9,7 +9,7 @@
 # Between releases, (such as when compiling notmuch from the git
 # repository), we let git append identification of the actual commit.
 PACKAGE=notmuch
-VERSION:=$(shell if [ -f version ]; then cat version; else git describe --match '[0-9].[0-9]*'; fi)
+VERSION:=$(shell if [ -f version ]; then cat version; else git describe --match '[0-9.]*'; fi)
 
 RELEASE_HOST=notmuchmail.org
 RELEASE_DIR=/srv/notmuchmail.org/www/releases
@@ -69,7 +69,7 @@ dist: $(TAR_FILE)
 # We invoke make recursively only to force ordering of our phony
 # targets in the case of parallel invocation of make (-j).
 .PHONY: release
-release: verify-version
+release: verify-no-dirty-code
        $(MAKE) test
        $(MAKE) $(GPG_FILE)
        $(MAKE) verify-newer
@@ -116,13 +116,32 @@ release-message:
        @echo ""
        @echo "For more about notmuch, see http://notmuchmail.org"
 
+.PHONY: verify-no-dirty-code
+verify-no-dirty-code: verify-version
+       @printf "Checking that source tree is clean..."
+ifneq ($(shell git ls-files -m),)
+       @echo "No"
+       @echo "The following files have been modified since the most recent git commit:"
+       @echo ""
+       @git ls-files -m
+       @echo ""
+       @echo "The release will be made from the committed state, but perhaps you meant"
+       @echo "to commit this code first? Please clean this up to make it more clear."
+       @false
+else
+       @echo "Good"
+endif
 
 .PHONY: verify-version
 verify-version:
-       @echo -n "Checking that $(VERSION) is a two-component version..."
-       @if echo $(VERSION) | grep -q -v -x '[0-9]*\.[0-9]*'; then \
-               (echo "Ouch." && \
-                echo "Before releasing the notmuch version should be a two-component value." && false);\
+       @echo -n "Checking that $(VERSION) consists only of digits and periods..."
+       @if echo $(VERSION) | grep -q -v -x '[0-9.]*'; then \
+               (echo "No." && \
+                echo "Remember: You need to use:" && \
+                echo "" && \
+                echo " make VERSION=X.Y release" && \
+                echo "" && \
+                echo "to release notmuch." && false); \
         else :; fi
        @echo "Good."