external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-08-24 16:00:41 +08:00
commit 3a8c03a471
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/scripts/git.commit.sh
View file

@ -23,7 +23,7 @@ work_dir=`(cd ${work_dir}/.. && pwd)`
product_dir=$work_dir product_dir=$work_dir
# allow start script from any 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 cd $work_dir && work_branch=`git branch|grep "*"|awk '{print $2}'` && commit_branch=2.0release && git checkout $commit_branch
ret=$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 "work branch is $work_branch"
echo "commit branch is $commit_branch" echo "commit branch is $commit_branch"