vfs2: tree-items - fix incorrect sort-order based short-circuit

Tested-by: Rob Browning <rlb@defaultvalue.org>
Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/vfs2.py b/lib/bup/vfs2.py
index 7863144cf71e7ca6d88ba588bf78d449ef21ab07..a98cf18f4a30382213dd8b92cd79183fdae94c55 100644 (file)
--- a/lib/bup/vfs2.py
+++ b/lib/bup/vfs2.py
@@ -469,12 +469,8 @@ def tree_items(oid, tree_data, names=frozenset(), bupm=None):
             continue
         assert name != '.'
         if name not in names:
-            if bupm:
-                if (name + '/') > last_name:
-                    break  # given git sort order, we're finished
-            else:
-                if name > last_name:
-                    break  # given bupm sort order, we're finished
+            if name > last_name:
+                break  # given bupm sort order, we're finished
             if (kind == BUP_CHUNKED or not S_ISDIR(gitmode)) and bupm:
                 Metadata.read(bupm)
             continue