Skip to content

Commit 26e171a

Browse files
committed
Use ShortSha
1 parent da980d1 commit 26e171a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

services/webhook/general.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
user_model "code.gitea.io/gitea/models/user"
1313
webhook_model "code.gitea.io/gitea/models/webhook"
14+
"code.gitea.io/gitea/modules/base"
1415
"code.gitea.io/gitea/modules/setting"
1516
api "code.gitea.io/gitea/modules/structs"
1617
"code.gitea.io/gitea/modules/util"
@@ -309,7 +310,7 @@ func getPackagePayloadInfo(p *api.PackagePayload, linkFormatter linkFormatter, w
309310
}
310311

311312
func getStatusPayloadInfo(p *api.CommitStatusPayload, linkFormatter linkFormatter, withSender bool) (text string, color int) {
312-
refLink := linkFormatter(p.TargetURL, fmt.Sprintf("%s [%s]", p.Context, p.SHA[:7]))
313+
refLink := linkFormatter(p.TargetURL, fmt.Sprintf("%s [%s]", p.Context, base.ShortSha(p.SHA)))
313314

314315
text = fmt.Sprintf("Commit Status changed: %s - %s", refLink, p.Description)
315316
color = greenColor

services/webhook/matrix.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"strings"
1616

1717
webhook_model "code.gitea.io/gitea/models/webhook"
18+
"code.gitea.io/gitea/modules/base"
1819
"code.gitea.io/gitea/modules/git"
1920
"code.gitea.io/gitea/modules/json"
2021
"code.gitea.io/gitea/modules/log"
@@ -245,7 +246,7 @@ func (m matrixConvertor) Package(p *api.PackagePayload) (MatrixPayload, error) {
245246
}
246247

247248
func (m matrixConvertor) Status(p *api.CommitStatusPayload) (MatrixPayload, error) {
248-
refLink := htmlLinkFormatter(p.TargetURL, fmt.Sprintf("%s [%s]", p.Context, p.SHA[:7]))
249+
refLink := htmlLinkFormatter(p.TargetURL, fmt.Sprintf("%s [%s]", p.Context, base.ShortSha(p.SHA)))
249250
text := fmt.Sprintf("Commit Status changed: %s - %s", refLink, p.Description)
250251

251252
return m.newPayload(text)

0 commit comments

Comments
 (0)