修复git_pull命令执行顺序

This commit is contained in:
whyour 2021-03-29 12:02:32 +08:00
parent 02ed509a7f
commit 7df97a31e1

View File

@ -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成功后的操作
@ -90,19 +90,19 @@ function Git_CloneScripts {
function Git_PullScripts {
echo -e "更新scripts...\n"
cd ${ScriptsDir}
git fetch --all
git config --global user.email "noreplay@githb.com"
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
ExitStatusScripts=$?
echo
git stash pop
git reset --mixed
ExitStatusScripts=$?
echo
}
## 检测文件LXK9301/jd_scripts 仓库中的 docker/crontab_list.sh