JOJ/JOJ3
24
5
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: check only latest commit for non-ascii chars (#38)

Browse Source 
according to [this](https://focs.ji.sjtu.edu.cn/mm/focs-team/pl/nsfhoutszfds5c9wpfrmfxb51c) discussion in *joj-dev*

Reviewed-on: FOCS-dev/JOJ3#38
Co-authored-by: Mack Wang <mac-wang@outlook.com>
Co-committed-by: Mack Wang <mac-wang@outlook.com>
This commit is contained in:
王韵晨520370910012 2024-09-20 15:08:26 +08:00 committed by Boming Zhang
parent 61dada5c40
commit 9e5c933fbd
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/healthcheck/asciimsg

@ -1 +1 @@
Subproject commit 415ab7e9d8e74a5290eec18bec54b3a6d727d3d7 Subproject commit f2848d61097578d2439d3995820ea02a96ccad67

59
pkg/healthcheck/commit.go
View File

@ -7,7 +7,6 @@ import (
"unicode" "unicode"
"github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing/object"
) )
// nonAsciiMsg checks for non-ASCII characters in the commit message. // nonAsciiMsg checks for non-ASCII characters in the commit message.
@ -28,38 +27,52 @@ func NonAsciiMsg(root string) error {
slog.Error("getting reference", "err", err) slog.Error("getting reference", "err", err)
return fmt.Errorf("error getting reference: %v", err) return fmt.Errorf("error getting reference: %v", err)
} }
commits, err := repo.Log(&git.LogOptions{From: ref.Hash()})
commit, err := repo.CommitObject(ref.Hash())
if err != nil { if err != nil {
slog.Error("getting commits", "err", err) slog.Error("getting latest commit", "err", err)
return fmt.Errorf("error getting commits from reference %s: %v", ref.Hash(), err) return fmt.Errorf("error getting latest commit: %v", err)
} }
var msgs []string msg := commit.Message
err = commits.ForEach(func(c *object.Commit) error {
msgs = append(msgs, c.Message)
return nil
})
if err != nil {
slog.Error("iterating commits", "err", err)
return fmt.Errorf("error iterating commits: %v", err)
}
var nonAsciiMsgs []string
for _, msg := range msgs {
if msg == "" { if msg == "" {
return nil
}
var isCommitLegal bool = true
// List of prefixes to ignore in the commit message
ignoredPrefixes := []string{
"Co-authored-by:",
"Reviewed-by:",
"Co-committed-by:",
"Reviewed-on:",
}
// Split message by lines and ignore specific lines with prefixes
lines := strings.Split(msg, "\n")
for _, line := range lines {
trimmedLine := strings.TrimSpace(line)
ignore := false
for _, prefix := range ignoredPrefixes {
if strings.HasPrefix(trimmedLine, prefix) {
ignore = true
break
}
}
if ignore {
continue continue
} }
if strings.HasPrefix(msg, "Merge pull request") { // Check for non-ASCII characters in the rest of the lines
continue for _, c := range line {
}
for _, c := range msg {
if c > unicode.MaxASCII { if c > unicode.MaxASCII {
nonAsciiMsgs = append(nonAsciiMsgs, msg) isCommitLegal = false
break
} }
} }
} }
if len(nonAsciiMsgs) > 0 {
return fmt.Errorf("Non-ASCII characters in commit messages:\n%s", strings.Join(nonAsciiMsgs, "\n")) if !isCommitLegal {
return fmt.Errorf("Non-ASCII characters in commit messages:\n%s", msg)
} }
return nil return nil
} }