From dfd4eeca459f7d30ac192a32c7f6289c5a281291 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 26 Dec 2014 21:49:04 +0800 Subject: [PATCH] hotfix 1.0release, git checkout develop when commit --- trunk/scripts/git.commit.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/scripts/git.commit.sh b/trunk/scripts/git.commit.sh index 38932fdff..6645acdf2 100755 --- a/trunk/scripts/git.commit.sh +++ b/trunk/scripts/git.commit.sh @@ -2,7 +2,7 @@ cat <>/dev/null touch git-ensure-commit && -echo "cd `pwd` && git checkout master &&" >git-ensure-commit && +echo "cd `pwd` && git checkout develop &&" >git-ensure-commit && echo "bash `pwd`/git.commit.sh" >>git-ensure-commit && chmod +x git-ensure-commit && sudo rm -f /bin/git-ensure-commit && @@ -23,7 +23,7 @@ work_dir=`(cd ${work_dir}/.. && pwd)` product_dir=$work_dir # allow start script from any dir -cd $work_dir && git checkout master +cd $work_dir && git checkout develop . ${product_dir}/scripts/_log.sh ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi