From 1b70a4451a1b60973859faddb2c7ae31b56b1262 Mon Sep 17 00:00:00 2001
From: Giteabot <teabot@gitea.io>
Date: Tue, 19 May 2026 02:53:45 -0700
Subject: [PATCH] fix: add natural sort to sortTreeViewNodes (#37772) (#37777)

Backport #37772

Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Lavamini Inc <jianwangqau@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Nicolas <bircni@icloud.com>
---
 services/repository/files/tree.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go
index e678b07f56..36d0ae3cd9 100644
--- a/services/repository/files/tree.go
+++ b/services/repository/files/tree.go
@@ -13,6 +13,7 @@ import (
 	"strings"
 
 	repo_model "code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/fileicon"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
@@ -170,7 +171,7 @@ func sortTreeViewNodes(nodes []*TreeViewNode) {
 		if a != b {
 			return a < b
 		}
-		return nodes[i].EntryName < nodes[j].EntryName
+		return base.NaturalSortCompare(nodes[i].EntryName, nodes[j].EntryName) < 0
 	})
 }