Merge branch '2.0release' into develop

10 years ago · 2a4b448cce
parent d8030faabe a7f4104d45
commit 2a4b448cce
1 changed files with 1 additions and 1 deletions
--- a/trunk/scripts/git.commit.sh
+++ b/trunk/scripts/git.commit.sh
@ -24,7 +24,7 @@ product_dir=$work_dir

 # allow start script from any dir
 cd $work_dir && work_branch=`git branch -a|grep "*"|awk '{print $2}'` && commit_branch=2.0release && git checkout $commit_branch
-ret=$"; if [[ $ret -ne 0 ]]; then echo "switch branch failed. ret=$ret"; exit $ret; fi
+ret=$ret; if [[ $ret -ne 0 ]]; then echo "switch branch failed. ret=$ret"; exit $ret; fi
 echo "work branch is $work_branch"
 echo "commit branch is $commit_branch"