diff --git a/trunk/scripts/git.commit.sh b/trunk/scripts/git.commit.sh index e6f1e0d7c..2cbc0cfd4 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 develop &&" >git-ensure-commit && +echo "cd `pwd` &&" >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,10 @@ work_dir=`(cd ${work_dir}/.. && pwd)` product_dir=$work_dir # allow start script from any dir -cd $work_dir && git checkout 2.0release +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 +echo "work branch is $work_branch" +echo "commit branch is $commit_branch" . ${product_dir}/scripts/_log.sh ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi @@ -76,4 +79,7 @@ sync_push --tags srs.oschina sync_push --tags srs.gitlab ok_msg "push tags ok" +git checkout $work_branch +ok_msg "switch to work branch $work_branch" + exit 0