From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Aug 2018 18:17:05 +0000 (-0700)
Subject: Merge branch 'nd/pack-deltify-regression-fix'
X-Git-Tag: v2.19.0-rc1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29d9e3e2c47dd4b5053b0a98c891878d398463e3;p=thirdparty%2Fgit.git

Merge branch 'nd/pack-deltify-regression-fix'

In a recent update in 2.18 era, "git pack-objects" started
producing a larger than necessary packfiles by missing
opportunities to use large deltas.

* nd/pack-deltify-regression-fix:
  pack-objects: fix performance issues on packing large deltas
---

29d9e3e2c47dd4b5053b0a98c891878d398463e3
diff --cc pack-objects.h
index 08c6b57d49,6ffbdcf79f..62806ccc39
--- a/pack-objects.h
+++ b/pack-objects.h
@@@ -2,9 -2,7 +2,10 @@@
  #define PACK_OBJECTS_H
  
  #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