Skip to content
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.

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

updated commitchecker regex to work for ldap package #7318

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions tools/rebasehelpers/commitchecker/validate_test.go
Expand Up @@ -217,6 +217,7 @@ func TestValidateUpstreamCommitSummaries(t *testing.T) {
{valid: true, summary: "UPSTREAM: revert: abcd123: coreos/etcd: <carry>: a change"},
{valid: true, summary: "UPSTREAM: revert: abcd123: coreos/etcd: <drop>: a change"},
{valid: false, summary: "UPSTREAM: whoopsie daisy"},
{valid: true, summary: "UPSTREAM: gopkg.in/ldap.v2: 51: exposed better API for paged search"},
}
for _, test := range tests {
commit := util.Commit{Summary: test.summary, Sha: "abcd000"}
Expand Down
2 changes: 1 addition & 1 deletion tools/rebasehelpers/util/git.go
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
)

var UpstreamSummaryPattern = regexp.MustCompile(`UPSTREAM: (revert: [a-f0-9]{7,}: )?(([\w\.-]+\/[\w-]+)?: )?(\d+:|<carry>:|<drop>:)`)
var UpstreamSummaryPattern = regexp.MustCompile(`UPSTREAM: (revert: [a-f0-9]{7,}: )?(([\w\.-]+\/[\w-\.-]+)?: )?(\d+:|<carry>:|<drop>:)`)

// supportedHosts maps source hosts to the number of path segments that
// represent the account/repo for that host. This is necessary because we
Expand Down