Fix failure if base and head branches have the same name (#77)

cirrus-actions · May 12, 2021 · f9a0642 · f9a0642
1 parent 9d21e09
commit f9a0642
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -92,8 +92,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