Merge branch 'jc/receive-deny-current-branch-fix' into maint

diff --git a/pack-objects.h b/pack-objects.h
index 6ffbdcf79f3f52bd7a479e1fa6e1f02c9e54e205..c34036166a20affd53785f58e74d270ee25e9209 100644 (file)
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -3,6 +3,9 @@
 
 #include "object-store.h"
 #include "thread-utils.h"
+#include "pack.h"
+
+#define DEFAULT_DELTA_CACHE_SIZE (256 * 1024 * 1024)
 
 #define OE_DFS_STATE_BITS      2
 #define OE_DEPTH_BITS          12
@@ -353,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