openstack/project-config
Code Issues Proposed changes

Merge "be more resilient in make_branch.sh for retired repositories"

Browse Source
This commit is contained in:
Zuul 2018-06-26 06:00:59 +00:00 committed by Gerrit Code Review
commit 5f91596c90
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/copy-release-tools-scripts/files/release-tools/make_branch.sh
View File

@ -41,7 +41,6 @@ branch_as_path_entry=$(echo $NEW_BRANCH | sed -s 's|/|-|g')
setup_temp_space branch-$PROJECT-$branch_as_path_entry setup_temp_space branch-$PROJECT-$branch_as_path_entry
clone_repo $REPO clone_repo $REPO
cd $REPO cd $REPO
LANG=C git review -s
if $(git branch -r | grep $NEW_BRANCH > /dev/null); then if $(git branch -r | grep $NEW_BRANCH > /dev/null); then
echo "A $NEW_BRANCH branch already exists !" echo "A $NEW_BRANCH branch already exists !"
@ -50,6 +49,13 @@ if $(git branch -r | grep $NEW_BRANCH > /dev/null); then
exit 0 exit 0
fi fi
# NOTE(dhellmann): We wait to set up git-review until after we have
# checked for the branch and then check out the tagged point to create
# the branch in case the master branch has been retired since then and
# there is no longer a .gitreview file there.
LANG=C git checkout $START_POINT
LANG=C git review -s
echo "Creating $NEW_BRANCH from $START_POINT" echo "Creating $NEW_BRANCH from $START_POINT"
git branch $NEW_BRANCH $START_POINT git branch $NEW_BRANCH $START_POINT
REALSHA=`git show-ref -s $NEW_BRANCH` REALSHA=`git show-ref -s $NEW_BRANCH`