Merge branch 'du/cherry-is-plumbing' into maint

diff --git a/pack-objects.h b/pack-objects.h
index 62806ccc39ea31b425089f4f38121d81a02fe5dd..c34036166a20affd53785f58e74d270ee25e9209 100644 (file)
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -356,7 +356,7 @@ static inline unsigned long oe_delta_size(struct packing_data *pack,
                return e->delta_size_;
 
        /*
-        * pack->detla_size[] can't be NULL because oe_set_delta_size()
+        * pack->delta_size[] can't be NULL because oe_set_delta_size()
         * must have been called when a new delta is saved with
         * oe_set_delta().
         * If oe_delta() returns NULL (i.e. default state, which means