We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 319d779 commit 43c7305Copy full SHA for 43c7305
pkg/vcs/git_test.go
@@ -530,7 +530,11 @@ func TestBaseForDiff(t *testing.T) {
530
base, err := repo.repo.BaseForDiff(diff, &debugtracer.TestTracer{T: t})
531
require.NoError(t, err)
532
require.Len(t, base, 1)
533
- assert.Equal(t, []string{"branch-a", "master"}, base[0].Branches)
+ 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])
538
assert.Equal(t, commit2.Hash, base[0].Hash)
539
})
540
t.Run("choose latest", func(t *testing.T) {
0 commit comments