Permalink
Browse files

Reorder operations in release target so that no pushing/sending is do…

…ne if master differs from remotes/origin/master
  • Loading branch information...
1 parent 1c37d0d commit 9b929d4984a5b9e4d9132057ea9acfd719e81d0a @immerrr committed Apr 28, 2011
Showing with 4 additions and 3 deletions.
  1. +4 −3 Makefile
View
@@ -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!'

0 comments on commit 9b929d4

Please sign in to comment.