diff options
| author | Yarden Shoham <hrsi88@gmail.com> | 2023-02-25 05:43:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-24 22:43:26 -0500 |
| commit | 28625fba5bec01ef8278d6bf4ae40a3319ba301a (patch) | |
| tree | 32ebe04698a327199a6e73f659dfefd300c84cca /routers | |
| parent | 7c3196ceaca30411e5fbfd45eb7ac28b261a85c2 (diff) | |
| download | gitea-28625fba5bec01ef8278d6bf4ae40a3319ba301a.tar.gz gitea-28625fba5bec01ef8278d6bf4ae40a3319ba301a.zip | |
Redirect to the commit page after applying patch (#23056) (#23127)
Backport #23056
Fixes https://github.com/go-gitea/gitea/issues/22621
Co-authored-by: yp05327 <576951401@qq.com>
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/web/repo/patch.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/routers/web/repo/patch.go b/routers/web/repo/patch.go index 0ffec0c4ea..efb4662496 100644 --- a/routers/web/repo/patch.go +++ b/routers/web/repo/patch.go @@ -27,8 +27,6 @@ func NewDiffPatch(ctx *context.Context) { ctx.Data["PageIsPatch"] = true - ctx.Data["TreePath"] = "" - ctx.Data["commit_summary"] = "" ctx.Data["commit_message"] = "" if canCommit { @@ -54,7 +52,6 @@ func NewDiffPatchPost(ctx *context.Context) { branchName = form.NewBranchName } ctx.Data["PageIsPatch"] = true - ctx.Data["TreePath"] = "" ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL() ctx.Data["FileContent"] = form.Content ctx.Data["commit_summary"] = form.CommitSummary @@ -89,13 +86,14 @@ func NewDiffPatchPost(ctx *context.Context) { message += "\n\n" + form.CommitMessage } - if _, err := files.ApplyDiffPatch(ctx, ctx.Repo.Repository, ctx.Doer, &files.ApplyDiffPatchOptions{ + fileResponse, err := files.ApplyDiffPatch(ctx, ctx.Repo.Repository, ctx.Doer, &files.ApplyDiffPatchOptions{ LastCommitID: form.LastCommit, OldBranch: ctx.Repo.BranchName, NewBranch: branchName, Message: message, Content: strings.ReplaceAll(form.Content, "\r", ""), - }); err != nil { + }) + if err != nil { if models.IsErrBranchAlreadyExists(err) { // User has specified a branch that already exists branchErr := err.(models.ErrBranchAlreadyExists) @@ -114,6 +112,6 @@ func NewDiffPatchPost(ctx *context.Context) { if form.CommitChoice == frmCommitChoiceNewBranch && ctx.Repo.Repository.UnitEnabled(ctx, unit.TypePullRequests) { ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + util.PathEscapeSegments(ctx.Repo.BranchName) + "..." + util.PathEscapeSegments(form.NewBranchName)) } else { - ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(branchName) + "/" + util.PathEscapeSegments(form.TreePath)) + ctx.Redirect(ctx.Repo.RepoLink + "/commit/" + fileResponse.Commit.SHA) } } |