diff options
| author | zeripath <art27@cantab.net> | 2019-06-22 18:35:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-22 18:35:34 +0100 |
| commit | baefea311f1a66a97f9a2779ad3342f4f8167d28 (patch) | |
| tree | d294d768fe141af768c7f40de6f06eb6edddfeef /routers/repo/pull.go | |
| parent | d14595514e35810fbcf1dc0d7e3ba8ada4f08c07 (diff) | |
| download | gitea-baefea311f1a66a97f9a2779ad3342f4f8167d28.tar.gz gitea-baefea311f1a66a97f9a2779ad3342f4f8167d28.zip | |
Fix #732: Add LFS objects to base repository on merging (#7082)
On merge we walk the merge history and ensure that all lfs objects pointed to in
the history are added to the base repository. This switches from relying on having git-lfs installed on the server, (and in fact .gitattributes being correctly installed.)
Diffstat (limited to 'routers/repo/pull.go')
| -rw-r--r-- | routers/repo/pull.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 5be8aa57c1..36b0d047b1 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -20,6 +20,7 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/notification" + "code.gitea.io/gitea/modules/pull" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" @@ -596,7 +597,7 @@ func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) { return } - if err = pr.Merge(ctx.User, ctx.Repo.GitRepo, models.MergeStyle(form.Do), message); err != nil { + if err = pull.Merge(pr, ctx.User, ctx.Repo.GitRepo, models.MergeStyle(form.Do), message); err != nil { if models.IsErrInvalidMergeStyle(err) { ctx.Flash.Error(ctx.Tr("repo.pulls.invalid_merge_option")) ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index)) |