mirror of https://github.com/ceph/ceph-ansible.git
contrib: use prune to fetch
Sometimes git keeps data from remotes that are not up-to-date, i.e: remote branches. Using `--prune` will delete non-existing remote branches from git's caches. Signed-off-by: Sébastien Han <seb@redhat.com>pull/1200/head
parent
93157773b5
commit
b233de51ba
|
@ -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 $(git branch -r | egrep 'origin/master|origin/ansible-1.9|origin/stable-' | grep -v origin/HEAD | cut -d '/' -f2); 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
|
||||
|
|
Loading…
Reference in New Issue