增加重新clone后的切分支逻辑

qa_shell_script/2_get_code_by_type.sh

@@ -28,13 +28,16 @@ function getCode()
 			git checkout ./
 			git fetch
 			git pull
+			#如果拉代码失败，则获取现在所处分支，然后删掉现在的项目，重新clone
 			if [ $? -ne 0 ]; then
         			echo "error: Pulling is not possible because you have unmerged files"
+				git_branch=`git branch  | grep '*' | awk  '{print $2}'`
 				cd $project_path
 				rm -rf $project_folder
 				sh $config_server/show_info.sh $project clone代码 $desc $2
 				git_path=`node $config_server/get_project_config.js  -name $project -attr git_path`
 				git clone $git_path
+				cd ./$project
 			fi
 			if [ -n "$git_branch" -a $git_branch != "originalBBB" ]; then
 				echo "git checkout -f $git_branch"