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

hotfix 1.0release, git checkout develop when commit

Browse source
This commit is contained in:
winlin 2014-12-26 21:49:04 +08:00
parent 9a66d22f3b
commit dfd4eeca45
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
cat <<END >>/dev/null cat <<END >>/dev/null
touch git-ensure-commit && 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 && echo "bash `pwd`/git.commit.sh" >>git-ensure-commit &&
chmod +x git-ensure-commit && chmod +x git-ensure-commit &&
sudo rm -f /bin/git-ensure-commit && sudo rm -f /bin/git-ensure-commit &&
@ -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 && git checkout master cd $work_dir && git checkout develop
. ${product_dir}/scripts/_log.sh . ${product_dir}/scripts/_log.sh
ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi