Skip to content

Make ghmerge useful for backports #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
esyr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make ghmerge useful for backports #238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions review-tools/ghmerge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,12 @@ else
fi
fi

set -- $(jq -r '[.head.user.login, .head.ref, .head.repo.ssh_url] | join(" ")' $PR_URL_CONTENTS)
set -- $(jq -r '[.head.user.login, .head.ref, .head.repo.ssh_url, .base.sha] | join(" ")' $PR_URL_CONTENTS)

WHO=$1
BRANCH=$2
REPO=$3
BASE=$4

if [ -z "$WHO" -o -z "$BRANCH" -o -z "$REPO" ]; then
echo "Could not determine from $PR_URL which branch of whom to fetch from where"
Expand Down Expand Up @@ -266,7 +267,7 @@ if [ "$PICK" == "no" ]; then
git fetch $REPO $BRANCH && git checkout -b $WORK FETCH_HEAD
WORK_USED=$WORK
REBASING=1
git rebase $TARGET || (echo -ne "Press Ctrl-d to abort, or fix the issue in another shell,\n run 'git rebase --continue' there, and on success press Enter here: "; read || exit 1)
git rebase --onto "$REMOTE/$TARGET" "$BASE" "$WORK" || (echo -ne "Press Ctrl-d to abort, or fix the issue in another shell,\n run 'git rebase --continue' there, and on success press Enter here: "; read || exit 1)
REBASING=
else
echo Cherry-picking $REPO/$BRANCH to $TARGET...
Expand Down