From 46ac45f63e6aaa464880193730d6dd0a75b8787b Mon Sep 17 00:00:00 2001
From: ngfchl <ngfchl@126.com>
Date: Thu, 25 Aug 2022 10:45:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 start.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/start.sh b/start.sh
index 1d146dc..7a618fd 100644
--- a/start.sh
+++ b/start.sh
@@ -14,8 +14,10 @@ if [ ! -e $CONTAINER_ALREADY_STARTED ]; then
     git remote add origin https://gitee.com/ngfchl/ptools &&
     # 设置拉取最新文件并覆盖
     git config pull.ff only &&
-    git pull &&
-    pip install -r requirements.txt &&
+    git pull
+  git checkout master &&
+    git branch --set-upstream-to=origin/master master
+  pip install -r requirements.txt &&
     python manage.py makemigrations &&
     python manage.py migrate &&
     python manage.py loaddata pt.json