diff --git a/pkg/apis/pipeline/v1/when_types.go b/pkg/apis/pipeline/v1/when_types.go index 76cb2ca98e3..dfd6948ce73 100644 --- a/pkg/apis/pipeline/v1/when_types.go +++ b/pkg/apis/pipeline/v1/when_types.go @@ -37,8 +37,6 @@ type WhenExpression struct { // +listType=atomic Values []string `json:"values,omitempty"` - // wokeignore:rule=master - // CEL is a string of Common Language Expression, which can be used to conditionally execute // the task based on the result of the expression evaluation // More info about CEL syntax: https://github.com/google/cel-spec/blob/master/doc/langdef.md diff --git a/pkg/resolution/resolver/git/resolver_test.go b/pkg/resolution/resolver/git/resolver_test.go index 02f56c52c8a..51bfcd6fa07 100644 --- a/pkg/resolution/resolver/git/resolver_test.go +++ b/pkg/resolution/resolver/git/resolver_test.go @@ -589,7 +589,6 @@ func TestResolve(t *testing.T) { cfg = make(map[string]string) } cfg[defaultTimeoutKey] = "1m" - // wokeignore:rule=master if cfg[defaultRevisionKey] == "" { cfg[defaultRevisionKey] = plumbing.Master.Short() } @@ -712,6 +711,7 @@ func createTestRepo(t *testing.T, commits []commitForRepo) (string, []string) { coOpts := &git.CheckoutOptions{ Branch: plumbing.NewBranchReferenceName(branch), } + if _, ok := hashesByBranch[branch]; !ok && branch != plumbing.Master.Short() { coOpts.Hash = plumbing.NewHash(startingHash.String()) coOpts.Create = true