winlin

hotfix 1.0release, git checkout develop when commit

@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 cat <<END >>/dev/null 3 cat <<END >>/dev/null
4 touch git-ensure-commit && 4 touch git-ensure-commit &&
5 -echo "cd `pwd` && git checkout master &&" >git-ensure-commit && 5 +echo "cd `pwd` && git checkout develop &&" >git-ensure-commit &&
6 echo "bash `pwd`/git.commit.sh" >>git-ensure-commit && 6 echo "bash `pwd`/git.commit.sh" >>git-ensure-commit &&
7 chmod +x git-ensure-commit && 7 chmod +x git-ensure-commit &&
8 sudo rm -f /bin/git-ensure-commit && 8 sudo rm -f /bin/git-ensure-commit &&
@@ -23,7 +23,7 @@ work_dir=`(cd ${work_dir}/.. && pwd)` @@ -23,7 +23,7 @@ work_dir=`(cd ${work_dir}/.. && pwd)`
23 product_dir=$work_dir 23 product_dir=$work_dir
24 24
25 # allow start script from any dir 25 # allow start script from any dir
26 -cd $work_dir && git checkout master 26 +cd $work_dir && git checkout develop
27 27
28 . ${product_dir}/scripts/_log.sh 28 . ${product_dir}/scripts/_log.sh
29 ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi 29 ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi