Skip to content

Commit

Permalink
Fix failure if base and head branches have the same name (cirrus-acti…
Browse files Browse the repository at this point in the history
  • Loading branch information
giorio94 authored and cjw6k committed Apr 26, 2022
1 parent 8258c06 commit a199750
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ git fetch origin $BASE_BRANCH
git fetch fork $HEAD_BRANCH

# do the rebase
git checkout -b $HEAD_BRANCH fork/$HEAD_BRANCH
git checkout -b fork/$HEAD_BRANCH fork/$HEAD_BRANCH
git rebase origin/$BASE_BRANCH

# push back
git push --force-with-lease fork $HEAD_BRANCH
git push --force-with-lease fork fork/$HEAD_BRANCH:$HEAD_BRANCH

0 comments on commit a199750

Please sign in to comment.