From 7df97a31e1ae38b281f17e195852f120a245b345 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Mon, 29 Mar 2021 12:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgit=5Fpull=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shell/git_pull.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/shell/git_pull.sh b/shell/git_pull.sh
index fb73ed6f..2fcbd998 100755
--- a/shell/git_pull.sh
+++ b/shell/git_pull.sh
@@ -61,10 +61,10 @@ function Git_PullShell {
   git fetch --all
   git stash
   git pull
-  ExitStatusShell=$?
-  echo
   git stash pop
   git reset --mixed
+  ExitStatusShell=$?
+  echo
 }
 
 ## 更新shell成功后的操作
@@ -89,20 +89,20 @@ function Git_CloneScripts {
 ## 更新scripts
 function Git_PullScripts {
   echo -e "更新scripts...\n"
-  cd ${ScriptsDir}
-  git fetch --all
+  cd ${ScriptsDir}                 
   git config --global user.email "noreplay@githb.com"
-  git config --global user.name "noreplay"
-  git rm -f --ignore-unmatch i-chenzhe*
-  git rm -f --ignore-unmatch  moposmall*
+  git config --global user.name "noreplay"     
+  git fetch --all                    
+  git rm -f --ignore-unmatch i-chenzhe*               
+  git rm -f --ignore-unmatch  moposmall*                              
   git rm -f --ignore-unmatch qq34347476*
   git rm -f --ignore-unmatch whyour*
-  git stash
-  git pull
+  git stash           
+  git pull                   
+  git stash pop    
+  git reset --mixed
   ExitStatusScripts=$?
   echo
-  git stash pop
-  git reset --mixed
 }
 
 ## 检测文件：LXK9301/jd_scripts 仓库中的 docker/crontab_list.sh