From 72baf746f41e4edb72324c0769425a15bf83f841 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Wed, 3 May 2017 14:27:51 +0200 Subject: [PATCH] refactor: fix for PR with master branch. --- .github/cpr.sh | 2 +- .github/rmpr.sh | 2 +- .github/rpr.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/cpr.sh b/.github/cpr.sh index 18821a8fb..eb5d89d4f 100755 --- a/.github/cpr.sh +++ b/.github/cpr.sh @@ -23,4 +23,4 @@ branch=$(curl -s https://api.github.com/repos/containous/traefik/pulls/$pr | jq git remote add $remote git@github.com:$remote/traefik.git git fetch $remote $branch -git checkout -t $remote/$branch \ No newline at end of file +git checkout -t -b "$pr--$branch" $remote/$branch \ No newline at end of file diff --git a/.github/rmpr.sh b/.github/rmpr.sh index 03e818e88..2f9a6f558 100755 --- a/.github/rmpr.sh +++ b/.github/rmpr.sh @@ -23,5 +23,5 @@ branch=$(curl -s https://api.github.com/repos/containous/traefik/pulls/$pr | jq # clean git checkout $initial -git branch -D $branch +git branch -D "$pr--$branch" git remote remove $remote \ No newline at end of file diff --git a/.github/rpr.sh b/.github/rpr.sh index 8049088c0..57e9f7a9b 100755 --- a/.github/rpr.sh +++ b/.github/rpr.sh @@ -33,4 +33,4 @@ trap clean EXIT .github/cpr.sh $pr git rebase $base -git push --force-with-lease $remote $branch +git push --force-with-lease $remote "$pr--$branch"