tests: pin the worktree fixture branch name across git builds - #17
Open
gjjkbssg wants to merge 1 commit into
Open
tests: pin the worktree fixture branch name across git builds#17gjjkbssg wants to merge 1 commit into
gjjkbssg wants to merge 1 commit into
Conversation
Apple Git initializes new repositories on "main" while stock Linux git still defaults to "master"; the hardcoded checkouts therefore fail on macOS developer machines even though the suite is green on the Linux CI. init -b main pins the name explicitly and the checkouts match it.
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
1 participant
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.
Fixes #16
internal/worktree's helper inits its fixture repo with the git build's default branch name and then hardcodescheckout master. Apple Git inits on "main" (and the helper masks the global config, so the built-in default is what applies), somake testfails on every macOS developer machine while staying green on the Linux CI runners whose git still defaults to "master" — awkward for a project whose primary platform is macOS.The change pins the name at init (
git init -b main, git >= 2.28) and checks outmaininTestRemoveAlland the fixture helper, which also matches the helper's existing "Initial commit on main" comment. No production code touched.Verified on macOS 15 (Apple Git 2.39.3, arm64):
gofmt -lclean,go vetandgo test ./...green in both the root andmachine/modules.