Merge branch 'en/filter-branch-deprecation'

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 6855f7fea56cb9cbceaad93afcfea3a8faf5da7e..7cad3f24ebd084fe653061f4f5899816853fc4f0 100644 (file)
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -100,7 +100,7 @@ static int show_tree(const struct object_id *oid, struct strbuf *base,
                                                  "BAD");
                                else
                                        xsnprintf(size_text, sizeof(size_text),
-                                                 "%lu", size);
+                                                 "%"PRIuMAX, (uintmax_t)size);
                        } else
                                xsnprintf(size_text, sizeof(size_text), "-");
                        printf("%06o %s %s %7s\t", mode, type,