From 6dcc0ab9b50e8a152407b409285a311cc13e3085 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 16 Apr 2023 12:10:06 +0200 Subject: [PATCH] maintainers/haskell/merge-and-open-pr: only push haskell-updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If we want to push only one branch, we'll have to specify branch and remote explicitly. Pushing to origin doesn't work for everyone, since some of us have a origin remote that can't be pushed to. Using plain `git push` has the problem that it'll try pushing all checked out branchs which fails e.g. if some branches (staging, staging-next, …) are behind their remote counterparts. The solution is to require everyone to configure a per branch pushRemote for haskell-updates which will then be used by merge-and-open-pr.sh. --- maintainers/scripts/haskell/merge-and-open-pr.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index 8b292ca50c8c..cdba24f0c207 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -53,6 +53,10 @@ if ! gh auth status 2>/dev/null ; then die "You must setup the \`gh\` command. Run \`gh auth login\`." fi +# Make sure this is configured before we start doing anything +push_remote="$(git config branch.haskell-updates.pushRemote \ + || die 'Can'\''t determine pushRemote for haskell-updates. Please set using `git config branch.haskell-updates.pushremote `.')" + # Fetch nixpkgs to get an up-to-date origin/haskell-updates branch. echo "Fetching origin..." git fetch origin >/dev/null @@ -89,8 +93,8 @@ echo "Regenerating Hackage packages..." ./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast --do-commit # Push these new commits to the haskell-updates branch -echo "Pushing commits just created to the remote haskell-updates branch..." -git push +echo "Pushing commits just created to the remote $push_remote/haskell-updates branch..." +git push "$push_remote" haskell-updates # Open new PR new_pr_body=$(cat <