Commit 519c72a4 authored by tywldx's avatar tywldx

update FETCH_HEAD

parent feca6ec4
...@@ -19,7 +19,7 @@ if [ -n "$project_folder" ];then ...@@ -19,7 +19,7 @@ if [ -n "$project_folder" ];then
cd ./$project_name cd ./$project_name
git checkout ./ git checkout ./
git fetch git fetch
git reset --hard git reset FETCH_HEAD --hard
#git pull #git pull
if [ -n "$git_branch" ]; then if [ -n "$git_branch" ]; then
echo "checkout specified branch $git_branch" echo "checkout specified branch $git_branch"
......
...@@ -24,8 +24,8 @@ function getCode() ...@@ -24,8 +24,8 @@ function getCode()
echo "sh $config_server/show_info.sh $project pull代码 $desc $3" echo "sh $config_server/show_info.sh $project pull代码 $desc $3"
sh $config_server/show_info.sh $project pull代码 $desc $3 sh $config_server/show_info.sh $project pull代码 $desc $3
cd ./$project cd ./$project
echo "git reset --hard" echo "git reset FETCH_HEAD --hard"
git reset --hard git reset FETCH_HEAD --hard
echo "git checkout ./" echo "git checkout ./"
git checkout ./ git checkout ./
echo "git fetch" echo "git fetch"
......
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