- # better safe than sorry
- run git checkout master
- msg pulling master from upstream/onelab
- run git pull $GIT_OPTIONS $UPSTREAMREPO refs/heads/master:refs/heads/master
- if [ -n "$PUSH_MASTER" ] ; then
- msg pushing master to flab
- run git push $GIT_OPTIONS $FLABREPO refs/heads/master:refs/heads/master
+ # pull onelab master onto upstreammaster - should be fast-forward
+ runcheckout upstreammaster
+ msg "pulling upstreammaster from upstream"
+ run git pull $GIT_OPTIONS upstream refs/heads/master:refs/heads/upstreammaster
+ # pull flab master onto master -
+ runcheckout master
+ msg "pulling master from flab"
+ run git pull $GIT_OPTIONS flab refs/heads/master:refs/head/master
+ # merge upstream upon local
+ msg "locally merging upstream into (flab) master"
+ run git pull $GIT_OPTIONS . upstreammaster
+ if [ -n "$PUSH" ] ; then
+ msg pushing master back to flab
+ run git push $GIT_OPTIONS flab refs/heads/master:refs/heads/master