open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-07-08 04:16:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复git_pull命令执行顺序

Browse Source
This commit is contained in:
whyour 2021-03-29 12:02:32 +08:00
parent 02ed509a7f
commit 7df97a31e1
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
shell/git_pull.sh
View File

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