Skip to content

Commit

Permalink
fix: entrypoint fork checkout conflicting names
Browse files Browse the repository at this point in the history
Continues work from b2eecca

We need to set the modified branch name to track the upstream unmodified branch name.
  • Loading branch information
wbh1 committed Feb 12, 2024
1 parent fbc0dcb commit 74f5b20
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ else
# make new branch, locally
git checkout -b "${localbranch}"
# make a new local branch with our upstream data
git branch --set-upstream-to=origin/"$BASEBRANCH" "${GITHUB_HEAD_REF}"
git branch --set-upstream-to=origin/"$BASEBRANCH" "${localbranch}"
git pull

# populate a local base branch with upstream data
Expand Down

0 comments on commit 74f5b20

Please sign in to comment.