From 67697bba2ba926954508a05628a838457b25fa0e Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Fri, 24 Sep 2021 12:32:18 -0400 Subject: Attempt to find the correct default git branch (#1217) Signed-off-by: Dave Henderson --- data/datasource_git_test.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'data/datasource_git_test.go') diff --git a/data/datasource_git_test.go b/data/datasource_git_test.go index f48393c3..33771410 100644 --- a/data/datasource_git_test.go +++ b/data/datasource_git_test.go @@ -229,10 +229,18 @@ func setupGitRepo(t *testing.T) billy.Filesystem { r, err := git.Init(s, repo) assert.NilError(t, err) + // default to main + h := plumbing.NewSymbolicReference(plumbing.HEAD, plumbing.ReferenceName("refs/heads/main")) + err = s.SetReference(h) + assert.NilError(t, err) + // config needs to be created after setting up a "normal" fs repo // this is possibly a bug in git-go? c, err := r.Config() assert.NilError(t, err) + + c.Init.DefaultBranch = "main" + s.SetConfig(c) assert.NilError(t, err) @@ -331,12 +339,12 @@ func TestOpenFileRepo(t *testing.T) { b, _ := ioutil.ReadAll(f) assert.Equal(t, "hello world", string(b)) - _, repo, err := g.clone(ctx, mustParseURL("git+file:///repo#master"), 0) + _, repo, err := g.clone(ctx, mustParseURL("git+file:///repo#main"), 0) assert.NilError(t, err) - ref, err := repo.Reference(plumbing.NewBranchReferenceName("master"), true) + ref, err := repo.Reference(plumbing.NewBranchReferenceName("main"), true) assert.NilError(t, err) - assert.Equal(t, "refs/heads/master", ref.Name().String()) + assert.Equal(t, "refs/heads/main", ref.Name().String()) _, repo, err = g.clone(ctx, mustParseURL("git+file:///repo#refs/tags/v1"), 0) assert.NilError(t, err) -- cgit v1.2.3