update

qa_shell_script/2_get_code_by_name.sh

@@ -19,7 +19,7 @@ if [ -n "$project_folder" ];then
 	cd ./$project_name
 	git checkout ./
 	git fetch
-	git reset FETCH_HEAD --hard
+	
 	#git pull
 	if [ -n "$git_branch" ]; then
 		echo "checkout specified branch $git_branch"
@@ -38,6 +38,7 @@ if [ -n "$project_folder" ];then
 		echo "current branch: $git_branch"
 		git pull
 	fi
+	git reset FETCH_HEAD --hard
 else
 	desc=`node $config_server/get_project_config.js  -name $project_name -attr desc`
 	sh $config_server/show_info.sh $project_name clone代码 $desc $3

qa_shell_script/2_get_code_by_type.sh

@@ -24,8 +24,7 @@ function getCode()
 			echo "sh $config_server/show_info.sh $project pull代码 $desc $3"
 			sh $config_server/show_info.sh $project pull代码 $desc $3
 			cd ./$project
-			echo "git reset FETCH_HEAD --hard"
-			git reset FETCH_HEAD --hard
+
 			echo "git checkout ./"
 			git checkout ./
 			echo "git fetch"
@@ -50,6 +49,8 @@ function getCode()
 				git_branch=$2
 			fi
 			git pull
+			echo "git reset FETCH_HEAD --hard"
+			git reset FETCH_HEAD --hard
 			git branch
 		else
 			sh $config_server/show_info.sh $project clone代码 $desc $3