aboutsummaryrefslogtreecommitdiff
path: root/routers/repo/pull.go
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-11-30 20:46:19 -0500
committerUnknwon <u@gogs.io>2015-11-30 20:46:19 -0500
commitdcb391d3415a84ec893d11b788f776ea89c301c3 (patch)
treed83263075dbbe416cc79691fd87cc1255226ddf5 /routers/repo/pull.go
parent5a14c3cf9854b2762a82ef6bdd781810380ab666 (diff)
parent830d00066785d131413d1de11ce301bf1f0b818a (diff)
Merge branch 'feature/wiki' into develop
Diffstat (limited to 'routers/repo/pull.go')
-rw-r--r--routers/repo/pull.go14
1 files changed, 2 insertions, 12 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index d7b4828a..8d6b4c7d 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -210,13 +210,7 @@ func PrepareViewPullInfo(ctx *middleware.Context, pull *models.Issue) *git.PullR
}
if pull.HeadRepo != nil {
- headRepoPath, err := pull.HeadRepo.RepoPath()
- if err != nil {
- ctx.Handle(500, "HeadRepo.RepoPath", err)
- return nil
- }
-
- headGitRepo, err = git.OpenRepository(headRepoPath)
+ headGitRepo, err = git.OpenRepository(pull.HeadRepo.RepoPath())
if err != nil {
ctx.Handle(500, "OpenRepository", err)
return nil
@@ -496,11 +490,7 @@ func PrepareCompareDiff(
)
// Get diff information.
- ctx.Data["CommitRepoLink"], err = headRepo.RepoLink()
- if err != nil {
- ctx.Handle(500, "RepoLink", err)
- return false
- }
+ ctx.Data["CommitRepoLink"] = headRepo.RepoLink()
headCommitID, err := headGitRepo.GetCommitIdOfBranch(headBranch)
if err != nil {