Commit 17fdeb9e authored by QA-甘 盛聪's avatar QA-甘 盛聪

update

parent 3a06d5ed
...@@ -15,6 +15,7 @@ if [ -n "$project_folder" ];then ...@@ -15,6 +15,7 @@ if [ -n "$project_folder" ];then
sh $config_server/show_info.sh $project_name pull代码 $desc sh $config_server/show_info.sh $project_name pull代码 $desc
cd ./$project_name cd ./$project_name
git checkout ./ git checkout ./
git pull
if [ -n "$git_branch" ]; then if [ -n "$git_branch" ]; then
echo "checkout specified branch $git_branch" echo "checkout specified branch $git_branch"
git checkout -f $git_branch git checkout -f $git_branch
...@@ -22,7 +23,7 @@ if [ -n "$project_folder" ];then ...@@ -22,7 +23,7 @@ if [ -n "$project_folder" ];then
echo "checkout branch $git_branch is ok". echo "checkout branch $git_branch is ok".
git pull git pull
else else
echo "Fail to checkout branch $git_branch". echo "<p tyle='color:red'>Fail to checkout branch $git_branch</p>".
exit 128 exit 128
fi fi
else else
......
...@@ -18,6 +18,7 @@ function getCode() ...@@ -18,6 +18,7 @@ function getCode()
sh $config_server/show_info.sh $project pull代码 $desc sh $config_server/show_info.sh $project pull代码 $desc
cd ./$project cd ./$project
git checkout ./ git checkout ./
git pull
if [ -n "$git_branch" ]; then if [ -n "$git_branch" ]; then
git checkout -f $git_branch git checkout -f $git_branch
if [ $? = 0 ]; then if [ $? = 0 ]; then
......
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