Merge pull request #1200 from ceph/contrib-branches

contrib: push all new stable branches to the galaxy
pull/1236/merge
Sébastien Han 2017-01-19 13:43:04 +01:00 committed by GitHub
commit 8e1ba93cbd
1 changed files with 2 additions and 2 deletions

View File

@ -29,7 +29,7 @@ function pull_origin {
function reset_hard_origin {
# let's bring everything back to normal
git checkout $LOCAL_BRANCH
git fetch origin
git fetch origin --prune
git fetch --tags
git reset --hard origin/master
}
@ -63,7 +63,7 @@ for ROLE in $ROLES; do
reset_hard_origin
# First we filter branches by rewriting master with the content of roles/$ROLE
# this gives us a new commit history
for BRANCH in $BRANCHES; do
for BRANCH in $(git branch --list --remotes "origin/stable-*" "origin/master" "origin/ansible-1.9" | cut -d '/' -f2); do
git checkout -B $BRANCH origin/$BRANCH
git filter-branch -f --prune-empty --subdirectory-filter roles/$ROLE
git push -f $REMOTE $BRANCH