Skip to content

Q
qa-deploy-utils
Commit 242deac8 authored by tywldx's avatar tywldx
Browse files
Options

remove feetch

parent 74fba317
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
qa_shell_script/2_get_code_by_name.sh
View file @ 242deac8
...@@ -18,7 +18,7 @@ if [ -n "$project_folder" ];then ...@@ -18,7 +18,7 @@ if [ -n "$project_folder" ];then
sh $config_server/show_info.sh $project_name pull代码 $desc $3 sh $config_server/show_info.sh $project_name pull代码 $desc $3
cd ./$project_name cd ./$project_name
git checkout ./ git checkout ./
git fetch git fetch -p
#git pull #git pull
if [ -n "$git_branch" ]; then if [ -n "$git_branch" ]; then
...@@ -38,7 +38,7 @@ if [ -n "$project_folder" ];then ...@@ -38,7 +38,7 @@ if [ -n "$project_folder" ];then
echo "current branch: $git_branch" echo "current branch: $git_branch"
# git pull # git pull
fi fi
echo "git reset FETCH_HEAD --hard"
git reset FETCH_HEAD --hard git reset FETCH_HEAD --hard
else else
desc=`node $config_server/get_project_config.js -name $project_name -attr desc` desc=`node $config_server/get_project_config.js -name $project_name -attr desc`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment