diff #7949.patch

--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -656,8 +656,8 @@ def paged_diffs(self, commit_id, start=0, end=None):
                     '--name-status',
                     '--no-abbrev',
                     '--root',
-                    # show tree entry itself as well as subtrees (Commit.added_paths relies on this)
-                    '-t',
+                    # show only the files that are changed in the repository.)
+                    '-r',
                     '-z'  # don't escape filenames and use \x00 as fields delimiter
                     ]
         if asbool(tg.config.get('scm.commit.git.detect_copies', True)):
@@ -679,21 +679,36 @@ def paged_diffs(self, commit_id, start=0, end=None):
         ]
         '''
 
+        dr =  {}
+        test_out = []
         x = 0
-        files = []
         while x < len(cmd_output):
             status = cmd_output[x][0]
+            l = []
+            l.append(cmd_output[x])
+            x += 1
+            l.append(h.really_unicode(cmd_output[x]))
+            x += 1
+            if status in ('R', 'C'):
+                l.append(h.really_unicode(cmd_output[x]))
+                x += 1
+            test_out.append(l)
+
+        test_out.sort(key=lambda x: x[-1][x[-1].rfind('/')+1], reverse = False)
+        x = 0
+        files = []
+        while x < len(test_out):
+            status = test_out[x][0][0]
             if status in ('R', 'C'):
-                ratio = float(cmd_output[x][1:4]) / 100.0
+                ratio = float(test_out[x][0][1:4]) / 100.0
                 files.append((status, {
-                    'new': h.really_unicode(cmd_output[x + 2]),
-                    'old': h.really_unicode(cmd_output[x + 1]),
+                    'new': h.really_unicode(test_out[x][2]),
+                    'old': h.really_unicode(test_out[x][1]),
                     'ratio': ratio,
                 }))
-                x += 3
             else:
-                files.append((status, h.really_unicode(cmd_output[x + 1])))
+            test_out.append(l)
+
+        test_out.sort(key=lambda x: x[-1][x[-1].rfind('/')+1], reverse = False)
+        x = 0
+        files = []
+        while x < len(test_out):
+            status = test_out[x][0][0]
             if status in ('R', 'C'):
-                ratio = float(cmd_output[x][1:4]) / 100.0
+                ratio = float(test_out[x][0][1:4]) / 100.0
                 files.append((status, {
-                    'new': h.really_unicode(cmd_output[x + 2]),
-                    'old': h.really_unicode(cmd_output[x + 1]),
+                    'new': h.really_unicode(test_out[x][2]),
+