Makefile: přejmenování větví

master na test a stable na master

Makefile

@@ -65,8 +65,8 @@ schema_all.pdf:
 deploy_test:
 	@if [ ${USER} != "www-mam" ]; then echo "Only possible by user www-mam"; exit 1; fi
 	@if [ `pwd` != "/akce/MaM/WWW/mamweb-test" ]; then echo "Only possible in /akce/MaM/WWW/mamweb-test"; exit 1; fi
-	@echo "Installing version from origin/master ..."
-	git pull origin master
+	@echo "Installing version from origin/test ..."
+	git pull origin test
 	git clean -f
 	make install
 	./manage.py migrate 
@@ -83,8 +83,8 @@ deploy_prod:
 	@if [ `pwd` != "/akce/MaM/WWW/mamweb-prod" ]; then echo "Only possible in /akce/MaM/WWW/mamweb-prod"; exit 1; fi
 	@echo "Backing up production DB ..."
 	( cd .. && ./backup_prod_db.sh )
-	@echo "Installing version from origin/stable ..."
-	git pull origin stable
+	@echo "Installing version from origin/master ..."
+	git pull origin master
 	git clean -f
 	make install
 	./manage.py migrate