From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 18:33:55 +0000 (-0700)
Subject: Merge branch 'jt/repack-promisor-packs'
X-Git-Tag: v2.19.0-rc0~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/36f0f344e71b928d47871e39fcef1908cb47c47b

Merge branch 'jt/repack-promisor-packs'

After a partial clone, repeated fetches from promisor remote would
have accumulated many packfiles marked with .promisor bit without
getting them coalesced into fewer packfiles, hurting performance.
"git repack" now learned to repack them.

* jt/repack-promisor-packs:
repack: repack promisor objects if -a or -A is set
repack: refactor setup of pack-objects cmd
---

36f0f344e71b928d47871e39fcef1908cb47c47b
diff --cc builtin/repack.c
index 6c636e159e,5c97dec3db..d5886039cc
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@@ -8,6 -8,7 +8,8 @@@
  #include "strbuf.h"
  #include "string-list.h"
  #include "argv-array.h"
+ #include "packfile.h"
++#include "object-store.h"
  
  static int delta_base_offset = 1;
  static int pack_kept_objects = -1;