Skip to content

Commit 2f39255

Browse files
committed
fix
1 parent 643beab commit 2f39255

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

cmd/embedded.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,7 @@ func compileCollectPatterns(args []string) (_ []glob.Glob, err error) {
301301
}
302302
pat := make([]glob.Glob, len(args))
303303
for i := range args {
304-
pat[i], err = glob.Compile(args[i], '/')
305-
if err != nil {
304+
if pat[i], err = glob.Compile(args[i], '/'); err != nil {
306305
return nil, fmt.Errorf("invalid glob patterh %q: %w", args[i], err)
307306
}
308307
}

models/migrations/v1_14/v165.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func ConvertHookTaskTypeToVarcharAndTrim(x *xorm.Engine) error {
3939
return err
4040
}
4141

42-
// Webhook: string `xorm:"VARCHAR(16) index"`
42+
// Webhook: Type string `xorm:"VARCHAR(16) index"`
4343
if err := base.ModifyColumn(x, "webhook", &schemas.Column{
4444
Name: "type",
4545
SQLType: schemas.SQLType{

modules/graceful/manager_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (g *Manager) start() {
4141
// Make SVC process
4242
run := svc.Run
4343

44-
isAnInteractiveSession, err := svc.IsAnInteractiveSession() //nolint:staticcheck // must IsAnInteractiveSession because IsWindowsService has a different permissions profile
44+
isAnInteractiveSession, err := svc.IsAnInteractiveSession() //nolint:staticcheck // must use IsAnInteractiveSession because IsWindowsService has a different permissions profile
4545
if err != nil {
4646
log.Error("Unable to ascertain if running as an Windows Service: %v", err)
4747
return

modules/templates/scopedtmpl/scopedtmpl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ type htmlTemplate struct {
109109

110110
type textTemplateCommon struct {
111111
_/*tmpl*/ map[string]*template.Template
112-
_/*muTmpl*/ sync.RWMutex //
112+
_/*muTmpl*/ sync.RWMutex
113113
_/*option*/ struct {
114114
missingKey int
115115
}

services/pull/merge.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ func handleCloseCrossReferences(ctx context.Context, pr *issues_model.PullReques
325325
}
326326

327327
// doMergeAndPush performs the merge operation without changing any pull information in database and pushes it up to the base repository
328-
func doMergeAndPush(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, mergeStyle repo_model.MergeStyle, expectedHeadCommitID, message string, pushTrigger repo_module.PushTrigger) (string, error) { //nolint:unparam // non error result is never used
328+
func doMergeAndPush(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, mergeStyle repo_model.MergeStyle, expectedHeadCommitID, message string, pushTrigger repo_module.PushTrigger) (string, error) { //nolint:unparam // non-error result is never used
329329
// Clone base repo.
330330
mergeCtx, cancel, err := createTemporaryRepoForMerge(ctx, pr, doer, expectedHeadCommitID)
331331
if err != nil {

0 commit comments

Comments
 (0)