Merge pull request #1537 from ldez/refactor-git-alias-safe
refactor: fix for PR with master branch.
This commit is contained in:
commit
e86df016c3
3 changed files with 3 additions and 3 deletions
2
.github/cpr.sh
vendored
2
.github/cpr.sh
vendored
|
@ -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
|
||||
git checkout -t -b "$pr--$branch" $remote/$branch
|
2
.github/rmpr.sh
vendored
2
.github/rmpr.sh
vendored
|
@ -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
|
2
.github/rpr.sh
vendored
2
.github/rpr.sh
vendored
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue