aboutsummaryrefslogtreecommitdiffstats
path: root/routers/web
diff options
context:
space:
mode:
authorAlexander McRae <alex@allspice.io>2025-03-06 18:40:39 -0800
committerGitHub <noreply@github.com>2025-03-07 02:40:39 +0000
commit582ad338d79fe129d079c2f14cf175adace53849 (patch)
tree615429afff56c6d86c9ef670ff9d348981226ca2 /routers/web
parentef18655215d965d25050842f24f2333b89fba443 (diff)
downloadgitea-582ad338d79fe129d079c2f14cf175adace53849.tar.gz
gitea-582ad338d79fe129d079c2f14cf175adace53849.zip
Use correct start and end commits for GetDiffTree (#33816)
Fixes https://github.com/go-gitea/gitea/pull/33514#issuecomment-2702814099 Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'routers/web')
-rw-r--r--routers/web/repo/pull.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 1d37fd8603..71057ec653 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -820,7 +820,7 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
if !fileOnly {
// note: use mergeBase is set to false because we already have the merge base from the pull request info
- diffTree, err := gitdiff.GetDiffTree(ctx, gitRepo, false, pull.MergeBase, headCommitID)
+ diffTree, err := gitdiff.GetDiffTree(ctx, gitRepo, false, startCommitID, endCommitID)
if err != nil {
ctx.ServerError("GetDiffTree", err)
return