Commit 74fba317 authored by tywldx's avatar tywldx

fix

parent e1702a03
...@@ -26,7 +26,7 @@ if [ -n "$project_folder" ];then ...@@ -26,7 +26,7 @@ if [ -n "$project_folder" ];then
git checkout -f $git_branch git checkout -f $git_branch
if [ $? = 0 ]; then if [ $? = 0 ]; 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 "Fail to checkout branch $git_branch".
exit -1 exit -1
...@@ -36,8 +36,9 @@ if [ -n "$project_folder" ];then ...@@ -36,8 +36,9 @@ if [ -n "$project_folder" ];then
#git checkout -f master #git checkout -f master
git_branch=`git branch | grep '*' | awk '{print $2}'` git_branch=`git branch | grep '*' | awk '{print $2}'`
echo "current branch: $git_branch" echo "current branch: $git_branch"
git pull # git pull
fi fi
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`
......
...@@ -29,8 +29,8 @@ function getCode() ...@@ -29,8 +29,8 @@ function getCode()
git checkout ./ git checkout ./
echo "git fetch" echo "git fetch"
git fetch git fetch
echo "git pull" # echo "git pull"
git pull # git pull
#如果拉代码失败,则获取现在所处分支,然后删掉现在的项目,重新clone #如果拉代码失败,则获取现在所处分支,然后删掉现在的项目,重新clone
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "error: Pulling is not possible because you have unmerged files" echo "error: Pulling is not possible because you have unmerged files"
......
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