baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix git rpr

Browse source 
Signed-off-by: Emile Vauge <emile@vauge.com>
This commit is contained in:
Emile Vauge 2017-02-03 11:41:58 +01:00
parent 8d0bacf146
commit e16f2bb23d
No known key found for this signature in database
GPG key ID: D808B4C167352E59
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
.github/rpr.sh vendored
View file

@ -4,9 +4,9 @@
set -e # stop on error set -e # stop on error
usage="$(basename "$0") pr -- rebase a Pull Request against current branch" usage="$(basename "$0") pr remote/branch -- rebase a Pull Request against a remote branch"
if [ "$#" -ne 1 ]; then if [ "$#" -ne 2 ]; then
echo "Illegal number of parameters" echo "Illegal number of parameters"
echo "$usage" >&2 echo "$usage" >&2
exit 1 exit 1
@ -16,20 +16,20 @@ command -v jq >/dev/null 2>&1 || { echo "I require jq but it's not installed. A
set -x # echo on set -x # echo on
base=$(git rev-parse --abbrev-ref HEAD) initial=$(git rev-parse --abbrev-ref HEAD)
pr=$1 pr=$1
base=$2
remote=$(curl -s https://api.github.com/repos/containous/traefik/pulls/$pr | jq -r .head.repo.owner.login) remote=$(curl -s https://api.github.com/repos/containous/traefik/pulls/$pr | jq -r .head.repo.owner.login)
branch=$(curl -s https://api.github.com/repos/containous/traefik/pulls/$pr | jq -r .head.ref) branch=$(curl -s https://api.github.com/repos/containous/traefik/pulls/$pr | jq -r .head.ref)
git checkout $base clean ()
{
.github/rmpr.sh $pr
}
git remote add $remote git@github.com:$remote/traefik.git trap clean EXIT
git fetch $remote $branch
git checkout -t $remote/$branch .github/cpr.sh $pr
git rebase origin/$base
git rebase $base
git push -f $remote $branch git push -f $remote $branch
# clean
git checkout $base
git branch -D $branch
git remote remove $remote