Skip to content

tests: pin the worktree fixture branch name across git builds #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gjjkbssg wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −4
Open

tests: pin the worktree fixture branch name across git builds #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions internal/worktree/worktree_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ import (
func initTestRepo(t *testing.T) string {
t.Helper()
dir := filepath.Join(t.TempDir(), "repo")
mustGit(t, "init", dir)
// Initial commit on main; init -b pins the name so the later checkouts
// work on every git build (Apple Git inits "main", stock Linux git
// "master").
mustGit(t, "init", "-b", "main", dir)
mustGit(t, "-C", dir, "config", "user.email", "test@test.com")
mustGit(t, "-C", dir, "config", "user.name", "Test")

// Initial commit on main
os.WriteFile(filepath.Join(dir, "file.txt"), []byte("v1"), 0o644)
mustGit(t, "-C", dir, "add", ".")
mustGit(t, "-C", dir, "commit", "-m", "init")
Expand All @@ -27,7 +29,7 @@ func initTestRepo(t *testing.T) string {
os.WriteFile(filepath.Join(dir, "file.txt"), []byte("v2"), 0o644)
mustGit(t, "-C", dir, "add", ".")
mustGit(t, "-C", dir, "commit", "-m", "feature change")
mustGit(t, "-C", dir, "checkout", "master")
mustGit(t, "-C", dir, "checkout", "main")

return dir
}
Expand Down Expand Up @@ -128,7 +130,7 @@ func TestRemoveAll(t *testing.T) {

// Create feature2 branch from feature
mustGit(t, "-C", repo, "checkout", "-b", "feature2")
mustGit(t, "-C", repo, "checkout", "master")
mustGit(t, "-C", repo, "checkout", "main")

wt1, err := Add(repo, "feature", wtBase, "")
require.NoError(t, err)
Expand Down