From 8637e67e6f9aa68c399a62d1180650c01069d67f Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 15 Aug 2016 02:06:35 -0700 Subject: Fix outdated edit can’t overwrite changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/repo/editor.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'routers/repo') diff --git a/routers/repo/editor.go b/routers/repo/editor.go index 71fb040f..ed1e9a13 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, ",") -- cgit v1.2.3