diff options
| author | zeripath <art27@cantab.net> | 2020-06-12 00:49:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 19:49:47 -0400 |
| commit | 0973c036019c955172ebce99d58eede2e9ac55ca (patch) | |
| tree | 7c49364bba0ebfb4eb8c4bb5194f643629b929bc /routers/repo/pull.go | |
| parent | 6c2a59b50c2af367281492b6c6adc9061e57b0a9 (diff) | |
| download | gitea-0973c036019c955172ebce99d58eede2e9ac55ca.tar.gz gitea-0973c036019c955172ebce99d58eede2e9ac55ca.zip | |
Handle more pathological branch and tag names (#11843)
* Handle more pathological branch and tag names
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix failing test
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'routers/repo/pull.go')
| -rw-r--r-- | routers/repo/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 42846fb93d..ebc4439dda 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -486,7 +486,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.Compare } compareInfo, err := baseGitRepo.GetCompareInfo(pull.BaseRepo.RepoPath(), - pull.BaseBranch, pull.GetGitRefName()) + git.BranchPrefix+pull.BaseBranch, pull.GetGitRefName()) if err != nil { if strings.Contains(err.Error(), "fatal: Not a valid object name") { ctx.Data["IsPullRequestBroken"] = true |