Skip to content

Commit

Permalink
Update create-pull-request.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulMaddox authored Oct 28, 2019
1 parent b61cabc commit e68b888
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion generate/create-pull-request.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
REQUEST_BRANCH="aws-goformation-updates"
echo "Creating new branch: ${REQUEST_BRANCH} tracking origin/${SRC_BRANCH}"
git checkout -b ${REQUEST_BRANCH} origin/${SRC_BRANCH}
git pull --rebase origin ${REQUEST_BRANCH} || true

# Merging in any changes from upstream
git remote add upstream https://github.com/${DST_REPO}.git
Expand Down Expand Up @@ -86,7 +87,6 @@ git commit -m "${COMMIT_MSG}"

echo "Pushing changes..."
git remote add origin-push https://${GITHUB_TOKEN}@github.com/${SRC_REPO}.git > /dev/null 2>&1
git pull --rebase origin ${REQUEST_BRANCH} || true
git push --quiet --set-upstream origin-push ${REQUEST_BRANCH}
sleep 10

Expand Down

0 comments on commit e68b888

Please sign in to comment.