aboutsummaryrefslogtreecommitdiffstats
path: root/routers/web
diff options
context:
space:
mode:
Diffstat (limited to 'routers/web')
-rw-r--r--routers/web/repo/commit.go1
-rw-r--r--routers/web/repo/compare.go3
-rw-r--r--routers/web/repo/pull.go7
3 files changed, 8 insertions, 3 deletions
diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
index 0e4e10bf50..d7865e18d6 100644
--- a/routers/web/repo/commit.go
+++ b/routers/web/repo/commit.go
@@ -328,6 +328,7 @@ func Diff(ctx *context.Context) {
MaxLineCharacters: setting.Git.MaxGitDiffLineCharacters,
MaxFiles: maxFiles,
WhitespaceBehavior: gitdiff.GetWhitespaceFlag(ctx.Data["WhitespaceBehavior"].(string)),
+ FileOnly: fileOnly,
}, files...)
if err != nil {
ctx.NotFound("GetDiff", err)
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index e6a04782e5..3927972837 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -611,6 +611,8 @@ func PrepareCompareDiff(
maxLines, maxFiles = -1, -1
}
+ fileOnly := ctx.FormBool("file-only")
+
diff, err := gitdiff.GetDiff(ctx, ci.HeadGitRepo,
&gitdiff.DiffOptions{
BeforeCommitID: beforeCommitID,
@@ -621,6 +623,7 @@ func PrepareCompareDiff(
MaxFiles: maxFiles,
WhitespaceBehavior: whitespaceBehavior,
DirectComparison: ci.DirectComparison,
+ FileOnly: fileOnly,
}, ctx.FormStrings("files")...)
if err != nil {
ctx.ServerError("GetDiffRangeWithWhitespaceBehavior", err)
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 0efe1be76a..cc554a71ff 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -395,12 +395,12 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
var headBranchSha string
// HeadRepo may be missing
if pull.HeadRepo != nil {
- headGitRepo, err := gitrepo.OpenRepository(ctx, pull.HeadRepo)
+ headGitRepo, closer, err := gitrepo.RepositoryFromContextOrOpen(ctx, pull.HeadRepo)
if err != nil {
- ctx.ServerError("OpenRepository", err)
+ ctx.ServerError("RepositoryFromContextOrOpen", err)
return nil
}
- defer headGitRepo.Close()
+ defer closer.Close()
if pull.Flow == issues_model.PullRequestFlowGithub {
headBranchExist = headGitRepo.IsBranchExist(pull.HeadBranch)
@@ -747,6 +747,7 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
MaxLineCharacters: setting.Git.MaxGitDiffLineCharacters,
MaxFiles: maxFiles,
WhitespaceBehavior: gitdiff.GetWhitespaceFlag(ctx.Data["WhitespaceBehavior"].(string)),
+ FileOnly: fileOnly,
}
if !willShowSpecifiedCommit {