Skip to content

Commit debdd78

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix git empty check and HEAD request (go-gitea#33690) Fix some user name usages (go-gitea#33689) Try to fix ACME path when renew (go-gitea#33668) [skip ci] Updated translations via Crowdin Improve Open-with URL encoding (go-gitea#33666) Fix for Maven Package Naming Convention Handling (go-gitea#33678) Improve swagger generation (go-gitea#33664) Deleting repository should unlink all related packages (go-gitea#33653)
2 parents 681ec25 + 56a0a9c commit debdd78

File tree

25 files changed

+272
-157
lines changed

25 files changed

+272
-157
lines changed

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ insert_final_newline = false
1717

1818
[templates/swagger/v1_json.tmpl]
1919
indent_style = space
20+
insert_final_newline = false
2021

2122
[templates/user/auth/oidc_wellknown.tmpl]
2223
indent_style = space

.github/workflows/files-changed.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ jobs:
8585
8686
swagger:
8787
- "templates/swagger/v1_json.tmpl"
88+
- "templates/swagger/v1_input.json"
8889
- "Makefile"
8990
- "package.json"
9091
- "package-lock.json"

Makefile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,8 @@ ifdef DEPS_PLAYWRIGHT
165165
endif
166166

167167
SWAGGER_SPEC := templates/swagger/v1_json.tmpl
168-
SWAGGER_SPEC_S_TMPL := s|"basePath": *"/api/v1"|"basePath": "{{AppSubUrl \| JSEscape}}/api/v1"|g
169-
SWAGGER_SPEC_S_JSON := s|"basePath": *"{{AppSubUrl \| JSEscape}}/api/v1"|"basePath": "/api/v1"|g
168+
SWAGGER_SPEC_INPUT := templates/swagger/v1_input.json
170169
SWAGGER_EXCLUDE := code.gitea.io/sdk
171-
SWAGGER_NEWLINE_COMMAND := -e '$$a\'
172170

173171
TEST_MYSQL_HOST ?= mysql:3306
174172
TEST_MYSQL_DBNAME ?= testgitea
@@ -271,10 +269,8 @@ endif
271269
.PHONY: generate-swagger
272270
generate-swagger: $(SWAGGER_SPEC) ## generate the swagger spec from code comments
273271

274-
$(SWAGGER_SPEC): $(GO_SOURCES_NO_BINDATA)
275-
$(GO) run $(SWAGGER_PACKAGE) generate spec -x "$(SWAGGER_EXCLUDE)" -o './$(SWAGGER_SPEC)'
276-
$(SED_INPLACE) '$(SWAGGER_SPEC_S_TMPL)' './$(SWAGGER_SPEC)'
277-
$(SED_INPLACE) $(SWAGGER_NEWLINE_COMMAND) './$(SWAGGER_SPEC)'
272+
$(SWAGGER_SPEC): $(GO_SOURCES_NO_BINDATA) $(SWAGGER_SPEC_INPUT)
273+
$(GO) run $(SWAGGER_PACKAGE) generate spec --exclude "$(SWAGGER_EXCLUDE)" --input "$(SWAGGER_SPEC_INPUT)" --output './$(SWAGGER_SPEC)'
278274

279275
.PHONY: swagger-check
280276
swagger-check: generate-swagger
@@ -287,9 +283,11 @@ swagger-check: generate-swagger
287283

288284
.PHONY: swagger-validate
289285
swagger-validate: ## check if the swagger spec is valid
290-
$(SED_INPLACE) '$(SWAGGER_SPEC_S_JSON)' './$(SWAGGER_SPEC)'
286+
@# swagger "validate" requires that the "basePath" must start with a slash, but we are using Golang template "{{...}}"
287+
@$(SED_INPLACE) -E -e 's|"basePath":( *)"(.*)"|"basePath":\1"/\2"|g' './$(SWAGGER_SPEC)' # add a prefix slash to basePath
288+
@# FIXME: there are some warnings
291289
$(GO) run $(SWAGGER_PACKAGE) validate './$(SWAGGER_SPEC)'
292-
$(SED_INPLACE) '$(SWAGGER_SPEC_S_TMPL)' './$(SWAGGER_SPEC)'
290+
@$(SED_INPLACE) -E -e 's|"basePath":( *)"/(.*)"|"basePath":\1"\2"|g' './$(SWAGGER_SPEC)' # remove the prefix slash from basePath
293291

294292
.PHONY: checks
295293
checks: checks-frontend checks-backend ## run various consistency checks
@@ -380,6 +378,7 @@ lint-go-gopls: ## lint go files with gopls
380378

381379
.PHONY: lint-editorconfig
382380
lint-editorconfig:
381+
@echo "Running editorconfig check..."
383382
@$(GO) run $(EDITORCONFIG_CHECKER_PACKAGE) $(EDITORCONFIG_FILES)
384383

385384
.PHONY: lint-actions

cmd/web_acme.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ func runACME(listenAddr string, m http.Handler) error {
5454
altTLSALPNPort = p
5555
}
5656

57-
// FIXME: this path is not right, it uses "AppWorkPath" incorrectly, and writes the data into "AppWorkPath/https"
58-
// Ideally it should migrate to AppDataPath write to "AppDataPath/https"
59-
certmagic.Default.Storage = &certmagic.FileStorage{Path: setting.AcmeLiveDirectory}
60-
magic := certmagic.NewDefault()
6157
// Try to use private CA root if provided, otherwise defaults to system's trust
6258
var certPool *x509.CertPool
6359
if setting.AcmeCARoot != "" {
@@ -67,7 +63,13 @@ func runACME(listenAddr string, m http.Handler) error {
6763
log.Warn("Failed to parse CA Root certificate, using default CA trust: %v", err)
6864
}
6965
}
70-
myACME := certmagic.NewACMEIssuer(magic, certmagic.ACMEIssuer{
66+
// FIXME: this path is not right, it uses "AppWorkPath" incorrectly, and writes the data into "AppWorkPath/https"
67+
// Ideally it should migrate to AppDataPath write to "AppDataPath/https"
68+
// And one more thing, no idea why we should set the global default variables here
69+
// But it seems that the current ACME code needs these global variables to make renew work.
70+
// Otherwise, "renew" will use incorrect storage path
71+
certmagic.Default.Storage = &certmagic.FileStorage{Path: setting.AcmeLiveDirectory}
72+
certmagic.DefaultACME = certmagic.ACMEIssuer{
7173
CA: setting.AcmeURL,
7274
TrustedRoots: certPool,
7375
Email: setting.AcmeEmail,
@@ -77,8 +79,10 @@ func runACME(listenAddr string, m http.Handler) error {
7779
ListenHost: setting.HTTPAddr,
7880
AltTLSALPNPort: altTLSALPNPort,
7981
AltHTTPPort: altHTTPPort,
80-
})
82+
}
8183

84+
magic := certmagic.NewDefault()
85+
myACME := certmagic.NewACMEIssuer(magic, certmagic.DefaultACME)
8286
magic.Issuers = []certmagic.Issuer{myACME}
8387

8488
// this obtains certificates or renews them if necessary

models/organization/org_list.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ func GetUserOrgsList(ctx context.Context, user *user_model.User) ([]*MinimalOrg,
124124
if err := db.GetEngine(ctx).Select(columnsStr).
125125
Table("user").
126126
Where(builder.In("`user`.`id`", queryUserOrgIDs(user.ID, true))).
127+
OrderBy("`user`.lower_name ASC").
127128
Find(&orgs); err != nil {
128129
return nil, err
129130
}

models/repo/user_repo.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package repo
55

66
import (
77
"context"
8+
"strings"
89

910
"code.gitea.io/gitea/models/db"
1011
"code.gitea.io/gitea/models/perm"
@@ -149,9 +150,9 @@ func GetRepoAssignees(ctx context.Context, repo *Repository) (_ []*user_model.Us
149150
// If isShowFullName is set to true, also include full name prefix search
150151
func GetIssuePostersWithSearch(ctx context.Context, repo *Repository, isPull bool, search string, isShowFullName bool) ([]*user_model.User, error) {
151152
users := make([]*user_model.User, 0, 30)
152-
var prefixCond builder.Cond = builder.Like{"name", search + "%"}
153+
var prefixCond builder.Cond = builder.Like{"lower_name", strings.ToLower(search) + "%"}
153154
if isShowFullName {
154-
prefixCond = prefixCond.Or(builder.Like{"full_name", "%" + search + "%"})
155+
prefixCond = prefixCond.Or(db.BuildCaseInsensitiveLike("full_name", "%"+search+"%"))
155156
}
156157

157158
cond := builder.In("`user`.id",

models/repo/user_repo_test.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
user_model "code.gitea.io/gitea/models/user"
1313

1414
"github.com/stretchr/testify/assert"
15+
"github.com/stretchr/testify/require"
1516
)
1617

1718
func TestRepoAssignees(t *testing.T) {
@@ -38,3 +39,19 @@ func TestRepoAssignees(t *testing.T) {
3839
assert.NotContains(t, []int64{users[0].ID, users[1].ID, users[2].ID}, 15)
3940
}
4041
}
42+
43+
func TestGetIssuePostersWithSearch(t *testing.T) {
44+
assert.NoError(t, unittest.PrepareTestDatabase())
45+
46+
repo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
47+
48+
users, err := repo_model.GetIssuePostersWithSearch(db.DefaultContext, repo2, false, "USER", false /* full name */)
49+
require.NoError(t, err)
50+
require.Len(t, users, 1)
51+
assert.Equal(t, "user2", users[0].Name)
52+
53+
users, err = repo_model.GetIssuePostersWithSearch(db.DefaultContext, repo2, false, "TW%O", true /* full name */)
54+
require.NoError(t, err)
55+
require.Len(t, users, 1)
56+
assert.Equal(t, "user2", users[0].Name)
57+
}

modules/setting/server.go

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -169,20 +169,24 @@ func loadServerFrom(rootCfg ConfigProvider) {
169169
HTTPAddr = sec.Key("HTTP_ADDR").MustString("0.0.0.0")
170170
HTTPPort = sec.Key("HTTP_PORT").MustString("3000")
171171

172+
// DEPRECATED should not be removed because users maybe upgrade from lower version to the latest version
173+
// if these are removed, the warning will not be shown
174+
if sec.HasKey("ENABLE_ACME") {
175+
EnableAcme = sec.Key("ENABLE_ACME").MustBool(false)
176+
} else {
177+
deprecatedSetting(rootCfg, "server", "ENABLE_LETSENCRYPT", "server", "ENABLE_ACME", "v1.19.0")
178+
EnableAcme = sec.Key("ENABLE_LETSENCRYPT").MustBool(false)
179+
}
180+
172181
Protocol = HTTP
173182
protocolCfg := sec.Key("PROTOCOL").String()
183+
if protocolCfg != "https" && EnableAcme {
184+
log.Fatal("ACME could only be used with HTTPS protocol")
185+
}
186+
174187
switch protocolCfg {
175188
case "https":
176189
Protocol = HTTPS
177-
178-
// DEPRECATED should not be removed because users maybe upgrade from lower version to the latest version
179-
// if these are removed, the warning will not be shown
180-
if sec.HasKey("ENABLE_ACME") {
181-
EnableAcme = sec.Key("ENABLE_ACME").MustBool(false)
182-
} else {
183-
deprecatedSetting(rootCfg, "server", "ENABLE_LETSENCRYPT", "server", "ENABLE_ACME", "v1.19.0")
184-
EnableAcme = sec.Key("ENABLE_LETSENCRYPT").MustBool(false)
185-
}
186190
if EnableAcme {
187191
AcmeURL = sec.Key("ACME_URL").MustString("")
188192
AcmeCARoot = sec.Key("ACME_CA_ROOT").MustString("")
@@ -210,6 +214,9 @@ func loadServerFrom(rootCfg ConfigProvider) {
210214
deprecatedSetting(rootCfg, "server", "LETSENCRYPT_EMAIL", "server", "ACME_EMAIL", "v1.19.0")
211215
AcmeEmail = sec.Key("LETSENCRYPT_EMAIL").MustString("")
212216
}
217+
if AcmeEmail == "" {
218+
log.Fatal("ACME Email is not set (ACME_EMAIL).")
219+
}
213220
} else {
214221
CertFile = sec.Key("CERT_FILE").String()
215222
KeyFile = sec.Key("KEY_FILE").String()

options/locale/locale_ja-JP.ini

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,12 @@ show_only_public=公開のみ表示
385385

386386
issues.in_your_repos=あなたのリポジトリ
387387

388+
guide_title=アクティビティはありません
389+
guide_desc=現在フォロー中のリポジトリやユーザーがないため、表示するコンテンツがありません。 以下のリンクから、興味のあるリポジトリやユーザーを探すことができます。
390+
explore_repos=リポジトリを探す
391+
explore_users=ユーザーを探す
392+
empty_org=組織はまだありません。
393+
empty_repo=リポジトリはまだありません。
388394

389395
[explore]
390396
repos=リポジトリ
@@ -1348,6 +1354,8 @@ editor.new_branch_name_desc=新しいブランチ名…
13481354
editor.cancel=キャンセル
13491355
editor.filename_cannot_be_empty=ファイル名は空にできません。
13501356
editor.filename_is_invalid=`ファイル名が不正です: "%s"`
1357+
editor.commit_email=コミット メールアドレス
1358+
editor.invalid_commit_email=コミットに使うメールアドレスが正しくありません。
13511359
editor.branch_does_not_exist=このリポジトリにブランチ "%s" は存在しません。
13521360
editor.branch_already_exists=ブランチ "%s" は、このリポジトリに既に存在します。
13531361
editor.directory_is_a_file=ディレクトリ名 "%s" はすでにリポジトリ内のファイルで使用されています。
@@ -1693,7 +1701,9 @@ issues.time_estimate_invalid=見積時間のフォーマットが不正です
16931701
issues.start_tracking_history=が作業を開始 %s
16941702
issues.tracker_auto_close=タイマーは、このイシューがクローズされると自動的に終了します
16951703
issues.tracking_already_started=`<a href="%s">別のイシュー</a>で既にタイムトラッキングを開始しています!`
1704+
issues.stop_tracking=タイマー終了
16961705
issues.stop_tracking_history=が <b>%[1]s</b> の作業を終了 %[2]s
1706+
issues.cancel_tracking=破棄
16971707
issues.cancel_tracking_history=`がタイムトラッキングを中止 %s`
16981708
issues.del_time=このタイムログを削除
16991709
issues.add_time_history=が作業時間 <b>%[1]s</b> を追加 %[2]s
@@ -2329,6 +2339,8 @@ settings.event_fork=フォーク
23292339
settings.event_fork_desc=リポジトリがフォークされたとき。
23302340
settings.event_wiki=Wiki
23312341
settings.event_wiki_desc=Wikiページが作成・名前変更・編集・削除されたとき。
2342+
settings.event_statuses=ステータス
2343+
settings.event_statuses_desc=APIによってコミットのステータスが更新されたとき。
23322344
settings.event_release=リリース
23332345
settings.event_release_desc=リポジトリでリリースが作成・更新・削除されたとき。
23342346
settings.event_push=プッシュ
@@ -2876,6 +2888,14 @@ view_as_role=表示: %s
28762888
view_as_public_hint=READMEを公開ユーザーとして見ています。
28772889
view_as_member_hint=READMEをこの組織のメンバーとして見ています。
28782890

2891+
worktime=作業時間
2892+
worktime.date_range_start=期間 (自)
2893+
worktime.date_range_end=期間 (至)
2894+
worktime.query=集計
2895+
worktime.time=時間
2896+
worktime.by_repositories=リポジトリ別
2897+
worktime.by_milestones=マイルストーン別
2898+
worktime.by_members=メンバー別
28792899

28802900
[admin]
28812901
maintenance=メンテナンス

routers/api/packages/maven/api.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"strings"
99

1010
packages_model "code.gitea.io/gitea/models/packages"
11-
maven_module "code.gitea.io/gitea/modules/packages/maven"
1211
)
1312

1413
// MetadataResponse https://maven.apache.org/ref/3.2.5/maven-repository-metadata/repository-metadata.html
@@ -22,7 +21,7 @@ type MetadataResponse struct {
2221
}
2322

2423
// pds is expected to be sorted ascending by CreatedUnix
25-
func createMetadataResponse(pds []*packages_model.PackageDescriptor) *MetadataResponse {
24+
func createMetadataResponse(pds []*packages_model.PackageDescriptor, groupID, artifactID string) *MetadataResponse {
2625
var release *packages_model.PackageDescriptor
2726

2827
versions := make([]string, 0, len(pds))
@@ -35,11 +34,9 @@ func createMetadataResponse(pds []*packages_model.PackageDescriptor) *MetadataRe
3534

3635
latest := pds[len(pds)-1]
3736

38-
metadata := latest.Metadata.(*maven_module.Metadata)
39-
4037
resp := &MetadataResponse{
41-
GroupID: metadata.GroupID,
42-
ArtifactID: metadata.ArtifactID,
38+
GroupID: groupID,
39+
ArtifactID: artifactID,
4340
Latest: latest.Version.Version,
4441
Version: versions,
4542
}

routers/api/packages/maven/maven.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,19 @@ func handlePackageFile(ctx *context.Context, serveContent bool) {
8484
}
8585

8686
func serveMavenMetadata(ctx *context.Context, params parameters) {
87-
// /com/foo/project/maven-metadata.xml[.md5/.sha1/.sha256/.sha512]
88-
89-
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeMaven, params.toInternalPackageName())
90-
if errors.Is(err, util.ErrNotExist) {
91-
pvs, err = packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeMaven, params.toInternalPackageNameLegacy())
92-
}
87+
// path pattern: /com/foo/project/maven-metadata.xml[.md5/.sha1/.sha256/.sha512]
88+
// in case there are legacy package names ("GroupID-ArtifactID") we need to check both, new packages always use ":" as separator("GroupID:ArtifactID")
89+
pvsLegacy, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeMaven, params.toInternalPackageNameLegacy())
9390
if err != nil {
9491
apiError(ctx, http.StatusInternalServerError, err)
9592
return
9693
}
97-
if len(pvs) == 0 {
98-
apiError(ctx, http.StatusNotFound, packages_model.ErrPackageNotExist)
94+
pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeMaven, params.toInternalPackageName())
95+
if err != nil {
96+
apiError(ctx, http.StatusInternalServerError, err)
9997
return
10098
}
99+
pvs = append(pvsLegacy, pvs...)
101100

102101
pds, err := packages_model.GetPackageDescriptors(ctx, pvs)
103102
if err != nil {
@@ -110,7 +109,7 @@ func serveMavenMetadata(ctx *context.Context, params parameters) {
110109
return pds[i].Version.CreatedUnix < pds[j].Version.CreatedUnix
111110
})
112111

113-
xmlMetadata, err := xml.Marshal(createMetadataResponse(pds))
112+
xmlMetadata, err := xml.Marshal(createMetadataResponse(pds, params.GroupID, params.ArtifactID))
114113
if err != nil {
115114
apiError(ctx, http.StatusInternalServerError, err)
116115
return

routers/api/v1/api.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// This documentation describes the Gitea API.
88
//
99
// Schemes: https, http
10-
// BasePath: /api/v1
11-
// Version: {{AppVer | JSEscape}}
1210
// License: MIT http://opensource.org/licenses/MIT
1311
//
1412
// Consumes:

routers/api/v1/repo/collaborators.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package repo
77
import (
88
"errors"
99
"net/http"
10+
"strings"
1011

1112
"code.gitea.io/gitea/models/perm"
1213
access_model "code.gitea.io/gitea/models/perm/access"
@@ -274,12 +275,13 @@ func GetRepoPermissions(ctx *context.APIContext) {
274275
// "403":
275276
// "$ref": "#/responses/forbidden"
276277

277-
if !ctx.Doer.IsAdmin && ctx.Doer.LoginName != ctx.PathParam("collaborator") && !ctx.IsUserRepoAdmin() {
278+
collaboratorUsername := ctx.PathParam("collaborator")
279+
if !ctx.Doer.IsAdmin && ctx.Doer.LowerName != strings.ToLower(collaboratorUsername) && !ctx.IsUserRepoAdmin() {
278280
ctx.APIError(http.StatusForbidden, "Only admins can query all permissions, repo admins can query all repo permissions, collaborators can query only their own")
279281
return
280282
}
281283

282-
collaborator, err := user_model.GetUserByName(ctx, ctx.PathParam("collaborator"))
284+
collaborator, err := user_model.GetUserByName(ctx, collaboratorUsername)
283285
if err != nil {
284286
if user_model.IsErrUserNotExist(err) {
285287
ctx.APIError(http.StatusNotFound, err)

routers/web/repo/githttp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func httpBase(ctx *context.Context) *serviceHandler {
7878
strings.HasSuffix(ctx.Req.URL.Path, "git-upload-archive") {
7979
isPull = true
8080
} else {
81-
isPull = ctx.Req.Method == "GET"
81+
isPull = ctx.Req.Method == "HEAD" || ctx.Req.Method == "GET"
8282
}
8383

8484
var accessMode perm.AccessMode

services/context/api.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,11 @@ func RepoRefForAPI(next http.Handler) http.Handler {
291291
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
292292
ctx := GetAPIContext(req)
293293

294+
if ctx.Repo.Repository.IsEmpty {
295+
ctx.APIErrorNotFound("repository is empty")
296+
return
297+
}
298+
294299
if ctx.Repo.GitRepo == nil {
295300
ctx.APIErrorInternal(fmt.Errorf("no open git repo"))
296301
return

services/repository/delete.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
git_model "code.gitea.io/gitea/models/git"
1515
issues_model "code.gitea.io/gitea/models/issues"
1616
"code.gitea.io/gitea/models/organization"
17+
packages_model "code.gitea.io/gitea/models/packages"
1718
access_model "code.gitea.io/gitea/models/perm/access"
1819
project_model "code.gitea.io/gitea/models/project"
1920
repo_model "code.gitea.io/gitea/models/repo"
@@ -267,6 +268,11 @@ func DeleteRepositoryDirectly(ctx context.Context, doer *user_model.User, repoID
267268
return err
268269
}
269270

271+
// unlink packages linked to this repository
272+
if err = packages_model.UnlinkRepositoryFromAllPackages(ctx, repoID); err != nil {
273+
return err
274+
}
275+
270276
if err = committer.Commit(); err != nil {
271277
return err
272278
}

0 commit comments

Comments
 (0)