Skip to content

Commit 9b00d79

Browse files
lunnyfnetX
authored andcommitted
Fix migrate release from github (go-gitea#19510) (go-gitea#19523)
* Fix migrate release from github * Fix bug
1 parent 67c4cf3 commit 9b00d79

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

services/migrations/gitea_uploader.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package migrations
77

88
import (
99
"context"
10+
"errors"
1011
"fmt"
1112
"io"
1213
"net/url"
@@ -247,7 +248,6 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
247248
LowerTagName: strings.ToLower(release.TagName),
248249
Target: release.TargetCommitish,
249250
Title: release.Name,
250-
Sha1: release.TargetCommitish,
251251
Note: release.Body,
252252
IsDraft: release.Draft,
253253
IsPrerelease: release.Prerelease,
@@ -276,15 +276,18 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
276276
rel.OriginalAuthorID = release.PublisherID
277277
}
278278

279-
// calc NumCommits if no draft
280-
if !release.Draft {
279+
// calc NumCommits if possible
280+
if rel.TagName != "" {
281281
commit, err := g.gitRepo.GetTagCommit(rel.TagName)
282-
if err != nil {
283-
return fmt.Errorf("GetTagCommit[%v]: %v", rel.TagName, err)
284-
}
285-
rel.NumCommits, err = commit.CommitsCount()
286-
if err != nil {
287-
return fmt.Errorf("CommitsCount: %v", err)
282+
if !errors.Is(err, git.ErrNotExist{}) {
283+
if err != nil {
284+
return fmt.Errorf("GetTagCommit[%v]: %v", rel.TagName, err)
285+
}
286+
rel.Sha1 = commit.ID.String()
287+
rel.NumCommits, err = commit.CommitsCount()
288+
if err != nil {
289+
return fmt.Errorf("CommitsCount: %v", err)
290+
}
288291
}
289292
}
290293

0 commit comments

Comments
 (0)