From 1db238154684b1fed4fd2645fa2b01c81860625a Mon Sep 17 00:00:00 2001 From: Mario Lubenka Date: Thu, 26 Dec 2019 14:17:31 +0100 Subject: [PATCH] Push update after branch is restored (#9416) * Push update after branch is restored Signed-off-by: Mario Lubenka * Apply suggestions from code review Use name from deletedBranch Co-authored-by: Lunny Xiao Co-authored-by: Lauris BH --- routers/repo/branch.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 306deca36e..b0a1efc5b9 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -110,6 +110,22 @@ func RestoreBranchPost(ctx *context.Context) { return } + // Don't return error below this + if err := repofiles.PushUpdate( + ctx.Repo.Repository, + deletedBranch.Name, + repofiles.PushUpdateOptions{ + RefFullName: git.BranchPrefix + deletedBranch.Name, + OldCommitID: git.EmptySHA, + NewCommitID: deletedBranch.Commit, + PusherID: ctx.User.ID, + PusherName: ctx.User.Name, + RepoUserName: ctx.Repo.Owner.Name, + RepoName: ctx.Repo.Repository.Name, + }); err != nil { + log.Error("Update: %v", err) + } + ctx.Flash.Success(ctx.Tr("repo.branch.restore_success", deletedBranch.Name)) } -- 2.39.5