зеркало из https://github.com/mozilla/fxa.git
fix(scripts): ensure release script pulls changes from private/master
This commit is contained in:
Родитель
92ef686b2c
Коммит
fba3625792
|
@ -303,7 +303,9 @@ if [ "$PRIVATE_BRANCH_EXISTS" = "" ]; then
|
|||
|
||||
PRIVATE_REMOTE_BRANCH_EXISTS=`git branch -r | awk '{$1=$1};1' | grep "^$PRIVATE_REMOTE_BRANCH\$"` || true
|
||||
if [ "$PRIVATE_REMOTE_BRANCH_EXISTS" = "" ]; then
|
||||
echo "Warning: $PRIVATE_BRANCH branch not found on local or remote, creating one from $PRIVATE_REMOTE/master."
|
||||
git checkout --no-track -b "$PRIVATE_BRANCH" "$PRIVATE_REMOTE/master" > /dev/null 2>&1
|
||||
git pull "$PRIVATE_REMOTE" master > /dev/null 2>&1
|
||||
else
|
||||
git checkout --track -b "$PRIVATE_BRANCH" "$PRIVATE_REMOTE_BRANCH" > /dev/null 2>&1
|
||||
fi
|
||||
|
|
Загрузка…
Ссылка в новой задаче