From d82b0dbe9f6b1f0daf7f3e4603897c61b9345632 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Wed, 30 Nov 2022 16:13:18 +0800
Subject: [PATCH] Update commit.tpl

---
 plugins/gitea/hook/commit.tpl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/gitea/hook/commit.tpl b/plugins/gitea/hook/commit.tpl
index 7070accf5..8d7f44d08 100755
--- a/plugins/gitea/hook/commit.tpl
+++ b/plugins/gitea/hook/commit.tpl
@@ -10,6 +10,7 @@ GIT_PROJECT_DIR="${GIT_USER_DIR}/{$PROJECT}"
 
 
 git config --global credential.helper store
+git config --global pull.rebase false
 
 # echo $GIT_PROJECT_DIR
 if [ ! -d $GIT_PROJECT_DIR ];then
@@ -18,6 +19,7 @@ if [ ! -d $GIT_PROJECT_DIR ];then
 fi
 
 unset GIT_DIR
+
 cd $GIT_PROJECT_DIR && git pull
 
 # func 2
@@ -26,9 +28,13 @@ cd $GIT_PROJECT_DIR && git pull
 
 #更新的目的地址
 WEB_PATH={$WEB_ROOT}/{$USERNAME}/{$PROJECT}
-mkdir -p $WEB_PATH
 
-rsync -vauP --delete --exclude=".*" $GIT_PROJECT_DIR/ $WEB_PATH
+if [ ! -d $WEB_PATH ];then
+	mkdir -p $WEB_PATH
+	rsync -vauP --delete --exclude=".*" $GIT_PROJECT_DIR/ $WEB_PATH
+else
+	rsync -vauP --exclude=".*" $GIT_PROJECT_DIR/ $WEB_PATH
+fi
 
 sysName=`uname`
 if [ $sysName == 'Darwin' ]; then