From 20c135cd468a5c7f84994787ffb8ee0db4d87da9 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 22 Sep 2022 21:58:31 +0800 Subject: Use Go 1.19 fmt for Gitea 1.17, sync emoji data (#21239) The images used by Gitea's drone pipeline were upgraded to Go 1.19.x It causes the lint fails because Go 1.19 uses new code format. This PR partially backport #20758 (including the emoji-data sync), partially fix the format manually. --- modules/git/foreachref/parser.go | 6 ++---- modules/git/signature_gogit.go | 6 ++++-- modules/git/signature_nogogit.go | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'modules/git') diff --git a/modules/git/foreachref/parser.go b/modules/git/foreachref/parser.go index eb8b77d903..bf83a10ed5 100644 --- a/modules/git/foreachref/parser.go +++ b/modules/git/foreachref/parser.go @@ -68,8 +68,7 @@ func NewParser(r io.Reader, format Format) *Parser { // // It could, for example return something like: // -// { "objecttype": "tag", "refname:short": "v1.16.4", "object": "f460b7543ed500e49c133c2cd85c8c55ee9dbe27" } -// +// { "objecttype": "tag", "refname:short": "v1.16.4", "object": "f460b7543ed500e49c133c2cd85c8c55ee9dbe27" } func (p *Parser) Next() map[string]string { if !p.scanner.Scan() { return nil @@ -89,8 +88,7 @@ func (p *Parser) Err() error { // parseRef parses out all key-value pairs from a single reference block, such as // -// "objecttype tag\0refname:short v1.16.4\0object f460b7543ed500e49c133c2cd85c8c55ee9dbe27" -// +// "objecttype tag\0refname:short v1.16.4\0object f460b7543ed500e49c133c2cd85c8c55ee9dbe27" func (p *Parser) parseRef(refBlock string) (map[string]string, error) { if refBlock == "" { // must be at EOF diff --git a/modules/git/signature_gogit.go b/modules/git/signature_gogit.go index fe81cd97df..6f1c98420d 100644 --- a/modules/git/signature_gogit.go +++ b/modules/git/signature_gogit.go @@ -19,8 +19,10 @@ import ( type Signature = object.Signature // Helper to get a signature from the commit line, which looks like these: -// author Patrick Gundlach 1378823654 +0200 -// author Patrick Gundlach Thu, 07 Apr 2005 22:13:13 +0200 +// +// author Patrick Gundlach 1378823654 +0200 +// author Patrick Gundlach Thu, 07 Apr 2005 22:13:13 +0200 +// // but without the "author " at the beginning (this method should) // be used for author and committer. // diff --git a/modules/git/signature_nogogit.go b/modules/git/signature_nogogit.go index 81da739a5b..9d5638b804 100644 --- a/modules/git/signature_nogogit.go +++ b/modules/git/signature_nogogit.go @@ -37,8 +37,10 @@ func (s *Signature) Decode(b []byte) { } // Helper to get a signature from the commit line, which looks like these: -// author Patrick Gundlach 1378823654 +0200 -// author Patrick Gundlach Thu, 07 Apr 2005 22:13:13 +0200 +// +// author Patrick Gundlach 1378823654 +0200 +// author Patrick Gundlach Thu, 07 Apr 2005 22:13:13 +0200 +// // but without the "author " at the beginning (this method should) // be used for author and committer. func newSignatureFromCommitline(line []byte) (sig *Signature, err error) { -- cgit v1.2.3