Skip to content

update commit checker to tolerate glide updates, clarify bump commit #20381

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 21, 2018
Merged

update commit checker to tolerate glide updates, clarify bump commit #20381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions tools/rebasehelpers/commitchecker/commitchecker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ func main() {
// TODO: ...along with subtree merges.
nonbumpCommits := []util.Commit{}
for _, commit := range commits {
var lastDescriptionLine string
if descriptionLen := len(commit.Description); descriptionLen > 0 {
lastDescriptionLine = commit.Description[descriptionLen-1]
}
if !strings.HasPrefix(commit.Summary, "bump(") && !strings.HasPrefix(lastDescriptionLine, "git-subtree-split:") {
if !strings.HasPrefix(commit.Summary, "bump") {
nonbumpCommits = append(nonbumpCommits, commit)
}
}
Expand Down
4 changes: 2 additions & 2 deletions tools/rebasehelpers/commitchecker/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func ValidateUpstreamCommitsWithoutGodepsChanges(commits []util.Commit) error {
}
}
if len(problemCommits) > 0 {
label := "The following commits contain Godeps changes but aren't declared as UPSTREAM"
label := "The following commits contain vendor changes but aren't declared as UPSTREAM or bump(*) commits"
msg := renderGodepFilesError(label, problemCommits, RenderOnlyGodepsFiles)
return fmt.Errorf(msg)
}
Expand Down Expand Up @@ -117,7 +117,7 @@ func ValidateUpstreamCommitModifiesOnlyGodeps(commits []util.Commit) error {
}
}
if len(problemCommits) > 0 {
label := "The following UPSTREAM commits modify files outside Godeps"
label := "The following UPSTREAM commits modify files outside vendor"
msg := renderGodepFilesError(label, problemCommits, RenderAllFiles)
return fmt.Errorf(msg)
}
Expand Down