Skip to content

[Bug] Use correct start and end commits for GetDiffTree #33816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 7, 2025
Merged

[Bug] Use correct start and end commits for GetDiffTree #33816

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b976e58
[Bug] Use correct start and end commits for GetDiffTree
McRaeAlex Mar 6, 2025
caf4159
Merge branch 'main' into am/diff-tree-bug
wxiaoguang Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion routers/web/repo/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down