From b28efe4b773d9c82bf94ce50a1468ede69073c5e Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Fri, 26 Nov 2021 15:27:11 +0100 Subject: [PATCH 1/2] Fix code formating "make fmt" always want to change this, so better merge it so we do not introduce unrelated changes when running "make fmt" later --- services/auth/signin.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/auth/signin.go b/services/auth/signin.go index 5f75000d9836a..80be419962a5c 100644 --- a/services/auth/signin.go +++ b/services/auth/signin.go @@ -11,12 +11,12 @@ import ( "code.gitea.io/gitea/models/login" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/services/auth/source/oauth2" + "code.gitea.io/gitea/services/auth/source/smtp" _ "code.gitea.io/gitea/services/auth/source/db" // register the sources (and below) _ "code.gitea.io/gitea/services/auth/source/ldap" // register the ldap source - "code.gitea.io/gitea/services/auth/source/oauth2" - _ "code.gitea.io/gitea/services/auth/source/pam" // register the pam source - "code.gitea.io/gitea/services/auth/source/smtp" + _ "code.gitea.io/gitea/services/auth/source/pam" // register the pam source _ "code.gitea.io/gitea/services/auth/source/sspi" // register the sspi source ) From 5b69ce53e19175eecfba010bb530480e98f12455 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 26 Nov 2021 23:13:33 +0800 Subject: [PATCH 2/2] fix formatter, format imports first, then go fmt --- build/code-batch-process.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/code-batch-process.go b/build/code-batch-process.go index 4759baf906991..fdc5d99b97423 100644 --- a/build/code-batch-process.go +++ b/build/code-batch-process.go @@ -267,10 +267,10 @@ func main() { logVerbose("batch cmd: %s %v", subCmd, substArgs) switch subCmd { case "gitea-fmt": - cmdErrors = append(cmdErrors, passThroughCmd("gofmt", substArgs)) if containsString(subArgs, "-w") { cmdErrors = append(cmdErrors, giteaFormatGoImports(files)) } + cmdErrors = append(cmdErrors, passThroughCmd("gofmt", substArgs)) case "misspell": cmdErrors = append(cmdErrors, passThroughCmd("misspell", substArgs)) default: