Repository navigation
fix(repo): trust init.defaultBranch only for a branch the monorepo has - #529
Draft
roschaefer wants to merge 1 commit into
Draft
roschaefer wants to merge 1 commit into
roschaefer wants to merge 1 commit into
Conversation
Without origin/HEAD, the monorepo's default branch fell back to init.defaultBranch. That setting names the branch a new repository starts on, not this repository's default: `git init -b main` under a global `init.defaultBranch=master` gave `master`. Cloning an upstream whose default is also `master` then recorded no default-branch, so the splice looked for a nonexistent upstream `main`, and push failed for lack of a local `master`. The fallback now counts only if the monorepo has that branch, locally or as origin's. Otherwise the default branch is unknown, and clone, init and the submodule conversion already refuse with a message naming `git config init.defaultBranch` and `git remote set-head origin --auto`.
|
Warning Review limit reachedYou've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository. Next included review available in 43 minutes. View limit details
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. |
This branch has not been deployed
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
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.
Without origin/HEAD, the monorepo's default branch fell back to
init.defaultBranch. That setting names the branch a new repository
starts on, not this repository's default:
git init -b mainunder aglobal
init.defaultBranch=mastergavemaster. Cloning an upstreamwhose default is also
masterthen recorded no default-branch, so thesplice looked for a nonexistent upstream
main, and push failed forlack of a local
master.The fallback now counts only if the monorepo has that branch, locally or
as origin's. Otherwise the default branch is unknown, and clone, init
and the submodule conversion already refuse with a message naming
git config init.defaultBranchandgit remote set-head origin --auto.Fixes #20