pack-objects: fix off-by-one in delta-island tree-depth computation

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index d5d91eeed5c894ade986e489b9d7f41e6c718a0b..3d70ab1f427fd846195997be27f0d2d31f349e5c 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2709,9 +2709,11 @@ static void show_object(struct object *obj, const char *name, void *data)
 
        if (use_delta_islands) {
                const char *p;
-               unsigned depth = 0;
+               unsigned depth;
                struct object_entry *ent;
 
+               /* the empty string is a root tree, which is depth 0 */
+               depth = *name ? 1 : 0;
                for (p = strchr(name, '/'); p; p = strchr(p + 1, '/'))
                        depth++;