Ensure users can push from an image-deploy repository and respect deploy-branch #5757
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3bde079 to
49d3a10
Compare
7f1c16a to
90a8e2e
Compare
…t deploy-branch Previously, we created this weird bare repo that didn't do set all the normal git config. This change switches to cloning the local temp directory, fixing the `receive.denyCurrentBranch` property that blocked pushing to this weird bare repo after calling git:from-image or git:from-archive. Additionally, since we now use a git clone, we set the default branch correctly, ensuring git pushes later on that branch work as expected (and not on master if it was customized prior to app creation). Closes #5601 Closes #5662
In the case where a repository is new, the check to see if it is an empty repo during clone fails. We therefore create the initial repo via the fn-git-create-hook call when initializing the repo.
1ab453d to
1a320ea
Compare
The initial-branch flag only works on newer versions of git - 2.28.0+ - and the init.defaultBranch config is otherwise also ignored until then.
github-actions bot
pushed a commit
that referenced
this pull request
May 28, 2023
# History ## 0.30.6 Install/update via the bootstrap script: ```shell wget -NP . https://dokku.com/install/v0.30.6/bootstrap.sh sudo DOKKU_TAG=v0.30.6 bash bootstrap.sh ``` ### Bug Fixes - #5889: @josegonzalez Respect dashboard disabling properties in traefik - #5890: @josegonzalez Add missing report triggers and omitted proxy functionality - #5757: @josegonzalez Ensure users can push from an image-deploy repository and respect deploy-branch ### New Features - #5873: @josegonzalez Add dependabot to all plugin dependencies ### Dependencies - #5877: @dependabot[bot] chore(deps): bump github.com/multiformats/go-base36 from 0.1.1-0.20220823151017-f5af2eed4d9c to 0.2.0 in /plugins/cron - #5886: @josegonzalez chore: bump github.com/otiai10/copy from 1.9.0 to 1.11.0 - #5875: @dependabot[bot] chore(deps): bump github.com/gofrs/flock from 0.8.0 to 0.8.1 in /plugins/ps - #5885: @dependabot[bot] chore(deps): bump tj-actions/changed-files from 36.0.3 to 36.0.6 - #5871: @dependabot[bot] chore(deps): bump tj-actions/changed-files from 35.9.2 to 36.0.3 ### Other - #5887: @josegonzalez chore: bump github.com/ryanuber/columnize from 1.1.2-0.20190319233515-9e6335e58db3 to 2.1.2+incompatible - #5872: @Samuelodan Fix typo in upgrading docs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, we created this weird bare repo that didn't do set all the normal git config. This change switches to cloning the local temp directory, fixing the
receive.denyCurrentBranchproperty that blocked pushing to this weird bare repo after calling git:from-image or git:from-archive.Additionally, since we now use a git clone, we set the default branch correctly, ensuring git pushes later on that branch work as expected (and not on master if it was customized prior to app creation).
Closes #5601
Closes #5662