mirrors/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-01 13:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(pulls): respect diff.orderFile in diff file tree (#38566) (#38578)

Browse Source 
Backport #38566 by @eliroca

Co-authored-by: Elisei Roca <eroca@suse.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Giteabot
2026-07-22 11:14:16 -07:00
committed by GitHub
parent 1ae686696e
commit 1cf54fed70
4 changed files with 68 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/gitdiff/git_diff_tree.go
View File

@@ -60,6 +60,11 @@ func runGitDiffTree(ctx context.Context, gitRepo *git.Repository, useMergeBase b
cmd := gitcmd.NewCommand("diff-tree", "--raw", "-r", "--root").
AddOptionFormat("--find-renames=%s", setting.Git.DiffRenameSimilarityThreshold)
// HINT: GIT-DIFF-TREE-UI-CONFIG: apply the diff.orderfile explicitly
if git.GlobalConfig.DiffOrderFile != "" {
cmd.AddOptionFormat("-O%s", git.GlobalConfig.DiffOrderFile)
}
if useMergeBase {
cmd.AddArguments("--merge-base")
}