From 52d14c667aa59e9348387993994160de81fd6ab8 Mon Sep 17 00:00:00 2001
From: MaM Web user <mam-web@gimli.ms.mff.cuni.cz>
Date: Tue, 18 Sep 2018 02:20:55 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"Makefile:=20mo=C5=BEnost=20deploy=5Ft?=
 =?UTF-8?q?est=20deploynout=20i=20jinou=20branch."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tohle stejně nefungovalo. Asi je to dobrý nápad, ale git se chová jinak, než
jsem si myslel.

This reverts commit ba5ceb14ba4a945aa39c5d9e56c9526c58e151ae.
---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7abd5a36..51bbdfad 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 PYTHON=python2.7
 VE_VER=16.0.0
 LOCAL_PYTHON=bin/python
-TEST_BRANCH?=test
 
 all: install
 
@@ -67,7 +66,7 @@ deploy_test:
 	@if [ ${USER} != "mam-web" ]; then echo "Only possible by user mam-web"; 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/test ..."
-	git pull origin $(TEST_BRANCH)
+	git pull origin test
 	git clean -f
 	make install
 	./manage.py migrate