branch: elpa/lua-mode
commit 9b929d4984a5b9e4d9132057ea9acfd719e81d0a
Author: immerrr <[email protected]>
Commit: immerrr <[email protected]>
Reorder operations in release target so that no pushing/sending is done if
master differs from remotes/origin/master
---
Makefile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index c40db93..cd93847 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,9 @@ dist:
git archive --format=zip -o $(DISTFILE) --prefix=lua-mode/ HEAD
release:
- git diff --exit-code && \
+ git fetch && \
+ git diff remotes/origin/master --exit-code && \
git tag -a -m "Release tag" rel-$(VERSION) && \
- git push origin master && git pull origin master && \
- woger lua-l lua-mode lua-mode "release $(VERSION)" "Emacs major mode
for editing Lua files" release-notes-$(VERSION)
http://github.com/immerrr/lua-mode/
+ woger lua-l lua-mode lua-mode "release $(VERSION)" "Emacs major mode
for editing Lua files" release-notes-$(VERSION)
http://github.com/immerrr/lua-mode/ && \
+ git push origin master
@echo 'Send update to ELPA!'