diff options
| author | Adam Majer <amajer@suse.de> | 2023-12-13 21:02:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-13 21:02:00 +0000 |
| commit | cbf923e87bca0f50c2c01a60ccf544b63c365e98 (patch) | |
| tree | 9e2e66c688bdc0f740e1ae333847dfb33677c730 /routers/web/repo/branch.go | |
| parent | 064f05204c0539d1f92895776dee7f626a628e3b (diff) | |
| download | gitea-cbf923e87bca0f50c2c01a60ccf544b63c365e98.tar.gz gitea-cbf923e87bca0f50c2c01a60ccf544b63c365e98.zip | |
Abstract hash function usage (#28138)
Refactor Hash interfaces and centralize hash function. This will allow
easier introduction of different hash function later on.
This forms the "no-op" part of the SHA256 enablement patch.
Diffstat (limited to 'routers/web/repo/branch.go')
| -rw-r--r-- | routers/web/repo/branch.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go index a0bc1dadad..b6de5bf800 100644 --- a/routers/web/repo/branch.go +++ b/routers/web/repo/branch.go @@ -147,11 +147,18 @@ func RestoreBranchPost(ctx *context.Context) { return } + objectFormat, err := git.GetObjectFormatOfRepo(ctx, ctx.Repo.Repository.RepoPath()) + if err != nil { + log.Error("RestoreBranch: CreateBranch: %w", err) + ctx.Flash.Error(ctx.Tr("repo.branch.restore_failed", deletedBranch.Name)) + return + } + // Don't return error below this if err := repo_service.PushUpdate( &repo_module.PushUpdateOptions{ RefFullName: git.RefNameFromBranch(deletedBranch.Name), - OldCommitID: git.EmptySHA, + OldCommitID: objectFormat.Empty().String(), NewCommitID: deletedBranch.CommitID, PusherID: ctx.Doer.ID, PusherName: ctx.Doer.Name, |