From: Andreas Ericsson Date: Fri, 07 Nov 2008 08:13:21 GMT Subject: Re: [PATCH 1/4] pack-objects: new option --honor-pack-keep Message-ID: <4913F8A1.2050304@op5.se> In-Reply-To: Brandon Casey wrote: > This adds a new option to pack-objects which will cause it to ignore an > object which appears in a local pack which has a .keep file, even if it > was specified for packing. > > This option will be used by the porcelain repack. > > Signed-off-by: Brandon Casey > --- > > > This series replaces the previous series starting at > 6ee726bc "pack-objects: honor '.keep' files" > > It should be applied on top of > f34cf12d "packed_git: convert pack_local flag into a bitfield and add pack_keep" > > I created the series on top of f34cf12d rebased on top of master. > > Suggestions for a more appropriate name for --honor-pack-keep are very welcome. > > -brandon > > > Documentation/git-pack-objects.txt | 5 +++++ > builtin-pack-objects.c | 7 +++++++ > 2 files changed, 12 insertions(+), 0 deletions(-) > > diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt > index 8c354bd..f9fac2c 100644 > --- a/Documentation/git-pack-objects.txt > +++ b/Documentation/git-pack-objects.txt > @@ -109,6 +109,11 @@ base-name:: > The default is unlimited, unless the config variable > `pack.packSizeLimit` is set. > > +--honor-pack-keep:: > + This flag causes an object already in a local pack that > + has a .keep file to be ignored, even if it appears in the > + standard input. > + Keep-files are *always* honored. Make this option "--ignore-kept" or something instead, otherwise people will see the synopsis and think they need to always pass it to not remove .keep-protected packs, which is stupid. -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231