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

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Elisei Rocaandwxiaoguang authored and GitHub committed 2026-07-22 15:56:29 +00:00
1 parent bc3f63095b
commit c8df67c0d0
4 files changed
+68 -2

No files matched your search

+5
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")
}