[windup-dev] Github PR rebase script // Fwd: Re: Git pull request automation?
Here is a script which Brian uses to rebase and merge selected PR's.
Could be handy.
HTH,
Ondra
-------- Original Message --------
Subject: Re: Git pull request automation?
Date: Tue, 30 Apr 2013 09:47:20 -0500
From: Brian Stansberry <brian.stansberry(a)redhat.com>
To: Ondrej Zizka <ozizka(a)redhat.com>
CC: Carlo de Wolf <cdewolf(a)redhat.com>
AIUI Carlo's team is building some automation around this for EAP.
I have a simple script I use to bring down a bunch of pull requests into
a single branch.[1] I then push that branch to upstream master-ignore.
Lightning and Tomaz Cerar's team city test that branch whenever changes
are made. If that goes well, I merge the branch to master and push.
The other mergers do similar things, probably with better scripts for
the first bit.
I don't use the requester's remote; the PR is available via the wildfly
github repo. See the script for details.
[1]
pull() {
cmd="git fetch upstream master "
for var in "$@"
do
cmd="$cmd pull/$var/head:pullRequest$var"
done
$cmd
git branch -D pulls
git checkout master
git rebase upstream/master
git checkout -b pulls
for var in "$@"
do
git checkout pullRequest$var
git rebase pulls
git checkout pulls
git merge pullRequest$var
git branch -D pullRequest$var
done
}
On 4/30/13 9:16 AM, Ondrej Zizka wrote:
Hi Brian,
if I want to test and review the pull request before merging, it seems
that I have to add the requester's remote, fetch it, check out his
branch, then do what I want.
With the pace of PRs to AS, I assume you have some automation for this,
perhaps through GitHub API. Is that available somewhere?
Or how do you proceed when you need to check something in an IDE, or
test something not covered by the testsuite, etc?
Thanks,
Ondra
--
Brian Stansberry
Principal Software Engineer
JBoss by Red Hat
Attachments:
- attachment.html (text/html — 3.2 KB)