Skip to content

Commit 6fec27f

Browse files
committed
Fix typo
1 parent 92983b7 commit 6fec27f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

services/pull/check.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,23 +301,23 @@ func manuallyMerged(ctx context.Context, pr *issues_model.PullRequest) bool {
301301
pr.Merger = merger
302302
pr.MergerID = merger.ID
303303

304-
ctx, commiter, err := db.TxContext(ctx)
304+
ctx, committer, err := db.TxContext(ctx)
305305
if err != nil {
306306
log.Error("%-v db.TxContext: %v", pr, err)
307307
return false
308308
}
309-
defer commiter.Close()
309+
defer committer.Close()
310310
if merged, err := pr.SetMerged(ctx); err != nil {
311311
log.Error("%-v setMerged : %v", pr, err)
312312
return false
313313
} else if !merged {
314314
return false
315315
}
316-
if err := commiter.Commit(); err != nil {
317-
log.Error("%-v commiter.Commit: %v", pr, err)
316+
if err := committer.Commit(); err != nil {
317+
log.Error("%-v committer.Commit: %v", pr, err)
318318
return false
319319
}
320-
commiter.Close()
320+
committer.Close()
321321

322322
notify_service.MergePullRequest(ctx, merger, pr)
323323

0 commit comments

Comments
 (0)