Skip to content

Commit 43c7305

Browse files
committed
pkg/vcs: support newer git versions
The test fails with newer git versions with: - (string) (len=6) "master" + (string) (len=4) "main" Or perhaps it's some global distro settings.
1 parent 319d779 commit 43c7305

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

pkg/vcs/git_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,11 @@ func TestBaseForDiff(t *testing.T) {
530530
base, err := repo.repo.BaseForDiff(diff, &debugtracer.TestTracer{T: t})
531531
require.NoError(t, err)
532532
require.Len(t, base, 1)
533-
assert.Equal(t, []string{"branch-a", "master"}, base[0].Branches)
533+
require.Len(t, base[0].Branches, 2)
534+
assert.Equal(t, "branch-a", base[0].Branches[0])
535+
// Different git versions name it differently.
536+
assert.True(t, base[0].Branches[1] == "master" || base[0].Branches[1] == "main",
537+
"branch=%q", base[0].Branches[1])
534538
assert.Equal(t, commit2.Hash, base[0].Hash)
535539
})
536540
t.Run("choose latest", func(t *testing.T) {

0 commit comments

Comments
 (0)