Skip to content

Commit

Permalink
Push update after branch is restored (#9416)
Browse files Browse the repository at this point in the history
* Push update after branch is restored

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Apply suggestions from code review

Use name from deletedBranch

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
  • Loading branch information
3 people committed Dec 26, 2019
1 parent 7bfb83e commit 1db2381
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions routers/repo/branch.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

Expand Down

0 comments on commit 1db2381

Please sign in to comment.