summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2022-04-27 07:24:06 +0800
committerGitHub <noreply@github.com>2022-04-26 19:24:06 -0400
commit2728f0c21360a81845b7b5aebe68c857a5d04bd5 (patch)
tree065b5ff3da5d44c9e7996cb83b55bbd2efbf26bc
parent41fcf7b7dee49021fca190c0ad7fe6bfb6e400b0 (diff)
downloadgitea-2728f0c21360a81845b7b5aebe68c857a5d04bd5.tar.gz
gitea-2728f0c21360a81845b7b5aebe68c857a5d04bd5.zip
Fix migrate release from github (#19510)
* Fix migrate release from github * Fix bug
-rw-r--r--services/migrations/gitea_uploader.go21
1 files changed, 12 insertions, 9 deletions
diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go
index 0303b0d60c..34dd59d7fc 100644
--- a/services/migrations/gitea_uploader.go
+++ b/services/migrations/gitea_uploader.go
@@ -7,6 +7,7 @@ package migrations
import (
"context"
+ "errors"
"fmt"
"io"
"os"
@@ -253,7 +254,6 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
LowerTagName: strings.ToLower(release.TagName),
Target: release.TargetCommitish,
Title: release.Name,
- Sha1: release.TargetCommitish,
Note: release.Body,
IsDraft: release.Draft,
IsPrerelease: release.Prerelease,
@@ -265,15 +265,18 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
return err
}
- // calc NumCommits if no draft
- if !release.Draft {
+ // calc NumCommits if possible
+ if rel.TagName != "" {
commit, err := g.gitRepo.GetTagCommit(rel.TagName)
- if err != nil {
- return fmt.Errorf("GetTagCommit[%v]: %v", rel.TagName, err)
- }
- rel.NumCommits, err = commit.CommitsCount()
- if err != nil {
- return fmt.Errorf("CommitsCount: %v", err)
+ if !errors.Is(err, git.ErrNotExist{}) {
+ if err != nil {
+ return fmt.Errorf("GetTagCommit[%v]: %v", rel.TagName, err)
+ }
+ rel.Sha1 = commit.ID.String()
+ rel.NumCommits, err = commit.CommitsCount()
+ if err != nil {
+ return fmt.Errorf("CommitsCount: %v", err)
+ }
}
}