[SEMVER] 6.0.12+0-gitea-1.21.11

Merge pull request 'fix(api): error 500 on tag creation when a workflow exists' (#3324 ) from earl-warren/forgejo:wip-v1.21-tag-api-regression into v1.21/forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3324 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
2024-04-19 11:41:35 +02:00 · 2024-04-19 09:38:18 +00:00 · 2024-04-19 10:52:17 +02:00
2 changed files with 1 additions and 3 deletions
--- a/2
+++ b/2
@ -89,7 +89,7 @@ endif
 VERSION = ${GITEA_VERSION}

 # SemVer
-FORGEJO_VERSION := 6.0.11+0-gitea-1.21.11
+FORGEJO_VERSION := 6.0.12+0-gitea-1.21.11

 LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" -X "code.gitea.io/gitea/routers/api/forgejo/v1.ForgejoVersion=$(FORGEJO_VERSION)" -X "main.ForgejoVersion=$(FORGEJO_VERSION)"

--- a/services/repository/files/commit.go
+++ b/services/repository/files/commit.go
@ -30,13 +30,11 @@ func CreateCommitStatus(ctx context.Context, repo *repo_model.Repository, creato
 	defer closer.Close()

 	if commit, err := gitRepo.GetCommit(sha); err != nil {
-		gitRepo.Close()
 		return fmt.Errorf("GetCommit[%s]: %w", sha, err)
 	} else if len(sha) != git.SHAFullLength {
 		// use complete commit sha
 		sha = commit.ID.String()
 	}
-	gitRepo.Close()

 	if err := git_model.NewCommitStatus(ctx, git_model.NewCommitStatusOptions{
 		Repo:         repo,