From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Mar 2014 20:50:29 +0000 (-0700)
Subject: Merge branch 'jk/repack-pack-keep-objects'
X-Git-Tag: v2.0.0-rc0~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=249d54b2311f1ca866dc2ce87c207d700d071101;p=thirdparty%2Fgit.git

Merge branch 'jk/repack-pack-keep-objects'

* jk/repack-pack-keep-objects:
  repack: add `repack.packKeptObjects` config var
---

249d54b2311f1ca866dc2ce87c207d700d071101
diff --cc builtin/repack.c
index 49f5857627,50cc281527..6b0b62dcb2
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@@ -167,14 -172,16 +172,16 @@@ int cmd_repack(int argc, const char **a
  				N_("write bitmap index")),
  		OPT_STRING(0, "unpack-unreachable", &unpack_unreachable, N_("approxidate"),
  				N_("with -A, do not loosen objects older than this")),
 -		OPT_INTEGER(0, "window", &window,
 +		OPT_STRING(0, "window", &window, N_("n"),
  				N_("size of the window used for delta compression")),
 -		OPT_INTEGER(0, "window-memory", &window_memory,
 +		OPT_STRING(0, "window-memory", &window_memory, N_("bytes"),
  				N_("same as the above, but limit memory size instead of entries count")),
 -		OPT_INTEGER(0, "depth", &depth,
 +		OPT_STRING(0, "depth", &depth, N_("n"),
  				N_("limits the maximum delta depth")),
 -		OPT_INTEGER(0, "max-pack-size", &max_pack_size,
 +		OPT_STRING(0, "max-pack-size", &max_pack_size, N_("bytes"),
  				N_("maximum size of each packfile")),
+ 		OPT_BOOL(0, "pack-kept-objects", &pack_kept_objects,
+ 				N_("repack objects in packs marked with .keep")),
  		OPT_END()
  	};