From 23cc8b3deda5e222f65b72d73b4dd4197a981925 Mon Sep 17 00:00:00 2001 From: Marco Iorio Date: Wed, 5 May 2021 11:13:29 +0200 Subject: [PATCH] Fix failure if base and head branches have the same name --- entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 7f2ce2c..e844670 100755 --- 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