Ensure that cluster catalog is initialized with branch master
#915
Conversation
This file contains 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
simu
changed the title
master
simu
force-pushed
the
fix/catalog-init
branch
from
5f46e7e to
ff125ab
Compare
Before this commit, Commodore could fail to push the initial catalog for a cluster if the user's Git config sets `init.defaultBranch`. The observed error is: ``` > Commiting changes... > Pushing catalog to remote... Error: Failed to push to the catalog repository: Git exited with status code 1 The error reported was: stderr: 'error: src refspec master does not match any error: failed to push some refs to 'ssh://<catalog repo>'' ``` This error is caused because GitPython falls back to `init.defaultBranch` when creating the catalog repo unless `initial_branch` is specified. However, since Commodore unconditionally falls back to trying to push `master` when no default branch can be identified in the remote repo (e.g. empty catalog repo), the push then fails because we're trying to push branch `master` which doesn't exist locally. This isn't an issue for `commodore component new` and `commodore package new` since we explicitly fall back to creating a `master` branch when initializing the worktree for the new dependency.
We also add a fixture which creates a predictable empty gitconfig for the tests.
simu
force-pushed
the
fix/catalog-init
branch
from
ff125ab to
26c9023
Compare
DebakelOrakel
approved these changes
Feb 9, 2024
|
Follow-up to rethink the handling of the default branch name in Commodore: #916 |
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.
Until now, Commodore could fail to push the initial catalog for a cluster if the user's Git config sets
init.defaultBranch. Theobserved error is:
This error is caused because GitPython falls back to
init.defaultBranchwhen creating the catalog repo unlessinitial_branchis specified.However, since Commodore unconditionally falls back to trying to push
masterwhen no default branch can be identified in the remote repo (e.g. empty catalog repo), the push then fails because we're trying to push branchmasterwhich doesn't exist locally.This isn't an issue for
commodore component newandcommodore package newsince we explicitly fall back to creating amasterbranch when initializing the worktree for the new dependency.Checklist
bug,enhancement,documentation,change,breaking,dependency,internalas they show up in the changelog