diff options
| author | Unknwon <u@gogs.io> | 2016-08-15 02:06:35 -0700 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-08-15 02:06:35 -0700 |
| commit | 8637e67e6f9aa68c399a62d1180650c01069d67f (patch) | |
| tree | 2bd982a1c1418d145ca236dd0bd56f6bd39c26d9 /routers/repo/editor.go | |
| parent | 4a19fd64412dc111bac3c1b56cf3eb55728d2ba3 (diff) | |
| download | gitea-8637e67e6f9aa68c399a62d1180650c01069d67f.tar.gz gitea-8637e67e6f9aa68c399a62d1180650c01069d67f.zip | |
Fix outdated edit can’t overwrite changes
Diffstat (limited to 'routers/repo/editor.go')
| -rw-r--r-- | routers/repo/editor.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/routers/repo/editor.go b/routers/repo/editor.go index 71fb040f9a..ed1e9a1360 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -129,6 +129,7 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo content := form.Content commitChoice := form.CommitChoice lastCommit := form.LastCommit + form.LastCommit = ctx.Repo.Commit.ID.String() if commitChoice == "commit-to-new-branch" { branchName = form.NewBranchName @@ -151,7 +152,7 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo ctx.Data["commit_message"] = form.CommitMessage ctx.Data["commit_choice"] = commitChoice ctx.Data["new_branch_name"] = branchName - ctx.Data["last_commit"] = ctx.Repo.Commit.ID + ctx.Data["last_commit"] = form.LastCommit ctx.Data["MarkdownFileExts"] = strings.Join(setting.Markdown.FileExtensions, ",") ctx.Data["LineWrapExtensions"] = strings.Join(setting.Repository.Editor.LineWrapExtensions, ",") ctx.Data["PreviewableFileModes"] = strings.Join(setting.Repository.Editor.PreviewableFileModes, ",") |