From: Junio C Hamano Date: Fri, 23 May 2008 23:06:01 +0000 (-0700) Subject: Merge branch 'bc/repack' X-Git-Tag: v1.5.6-rc0~22 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5e9714a106ab668ac982cf73f31919eb4e354fd;p=git.git Merge branch 'bc/repack' * bc/repack: Documentation/git-repack.txt: document new -A behaviour let pack-objects do the writing of unreachable objects as loose objects add a force_object_loose() function builtin-gc.c: deprecate --prune, it now really has no effect git-gc: always use -A when manually repacking repack: modify behavior of -A option to leave unreferenced objects unpacked Conflicts: builtin-pack-objects.c --- e5e9714a106ab668ac982cf73f31919eb4e354fd diff --cc builtin-pack-objects.c index e20851e1c,5a10119fb..f43eb6701 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@@ -66,8 -66,7 +67,8 @@@ static struct pack_idx_entry **written_ static uint32_t nr_objects, nr_alloc, nr_result, nr_written; static int non_empty; -static int no_reuse_delta, no_reuse_object, keep_unreachable, unpack_unreachable, include_tag; +static int reuse_delta = 1, reuse_object = 1; - static int keep_unreachable, include_tag; ++static int keep_unreachable, unpack_unreachable, include_tag; static int local; static int incremental; static int allow_ofs_delta; diff --cc git-repack.sh index 501519ab6,607f217b7..10f735cff --- a/git-repack.sh +++ b/git-repack.sh @@@ -8,10 -8,9 +8,10 @@@ OPTIONS_SPEC=" git-repack [options] -- a pack everything in a single pack - A same as -a, and keep unreachable objects too + A same as -a, and turn unreachable objects loose d remove redundant packs, and run git-prune-packed f pass --no-reuse-delta to git-pack-objects +n do not run git-update-server-info q,quiet be quiet l pass --local to git-pack-objects Packing constraints