diff options
| author | oliverpool <git@olivier.pfad.fr> | 2024-03-19 14:35:13 +0100 |
|---|---|---|
| committer | oliverpool <git@olivier.pfad.fr> | 2024-03-24 07:11:19 +0100 |
| commit | b990e07af0e2747fc813b2122e785af404ffe747 (patch) | |
| tree | 67a7f7b026ade90ca1857b6247ab86bd6a6cb396 /models | |
| parent | fix commit_status (diff) | |
| download | forgejo-b990e07af0e2747fc813b2122e785af404ffe747.tar.xz forgejo-b990e07af0e2747fc813b2122e785af404ffe747.zip | |
old migrations: warning instead of error
Diffstat (limited to 'models')
| -rw-r--r-- | models/migrations/v1_12/v128.go | 2 | ||||
| -rw-r--r-- | models/migrations/v1_12/v134.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/models/migrations/v1_12/v128.go b/models/migrations/v1_12/v128.go index 44d44a26c5..6eea1337ef 100644 --- a/models/migrations/v1_12/v128.go +++ b/models/migrations/v1_12/v128.go @@ -94,7 +94,7 @@ func FixMergeBase(x *xorm.Engine) error { } else { parentsString, _, err := git.NewCommand(git.DefaultContext, "rev-list", "--parents", "-n", "1").AddDynamicArguments(pr.MergedCommitID).RunStdString(&git.RunOpts{Dir: repoPath}) if err != nil { - log.Error("Unable to get parents for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err) + log.Warn("Unable to get parents for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err) continue } parents := strings.Split(strings.TrimSpace(parentsString), " ") diff --git a/models/migrations/v1_12/v134.go b/models/migrations/v1_12/v134.go index 3d1c82f09e..23c2916ba8 100644 --- a/models/migrations/v1_12/v134.go +++ b/models/migrations/v1_12/v134.go @@ -81,7 +81,7 @@ func RefixMergeBase(x *xorm.Engine) error { parentsString, _, err := git.NewCommand(git.DefaultContext, "rev-list", "--parents", "-n", "1").AddDynamicArguments(pr.MergedCommitID).RunStdString(&git.RunOpts{Dir: repoPath}) if err != nil { - log.Error("Unable to get parents for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err) + log.Warn("Unable to get parents for merged PR ID %d, Index %d in %s/%s. Error: %v", pr.ID, pr.Index, baseRepo.OwnerName, baseRepo.Name, err) continue } parents := strings.Split(strings.TrimSpace(parentsString), " ") |