diff options
| author | Luo Yifei <gdutyifei@163.com> | 2019-02-12 16:37:32 +0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-02-12 10:37:32 +0200 |
| commit | 7884353a04dfcb1e03b4b26801dc90e7d0d67a5b (patch) | |
| tree | d7e1f6e7d66c5406bb20c76223df4b789fe15744 /routers | |
| parent | baffea1ddb7e4424dbca7f8ab5f1de8cf17c8691 (diff) | |
| download | gitea-7884353a04dfcb1e03b4b26801dc90e7d0d67a5b.tar.gz gitea-7884353a04dfcb1e03b4b26801dc90e7d0d67a5b.zip | |
Add the Owner Name to differentiate when merging (#3807)
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/repo/pull.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go index a65b68a96e..043fc5c93a 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -692,8 +692,10 @@ func ParseCompareInfo(ctx *context.Context) (*models.User, *models.Repository, * if isSameRepo { headRepo = ctx.Repo.Repository headGitRepo = ctx.Repo.GitRepo + ctx.Data["BaseName"] = headUser.Name } else { headGitRepo, err = git.OpenRepository(models.RepoPath(headUser.Name, headRepo.Name)) + ctx.Data["BaseName"] = baseRepo.OwnerName if err != nil { ctx.ServerError("OpenRepository", err) return nil, nil, nil, nil, "", "" |