Merge branch 'jc/maint-1.6.0-keep-pack' into maint
commitc3067cbfb3fbab32177d5f61ea73127f08ab43cb
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Apr 2009 06:21:10 +0000 (8 23:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Apr 2009 06:21:10 +0000 (8 23:21 -0700)
tree0f6ee3c2d1835d591ca96df058c021b848be95b9
parent61e6108d94353d932d397e4be498c7e5293723eb
parent094085e3362c592c932b41525ed37152ec171192
Merge branch 'jc/maint-1.6.0-keep-pack' into maint

* jc/maint-1.6.0-keep-pack:
  pack-objects: don't loosen objects available in alternate or kept packs
  t7700: demonstrate repack flaw which may loosen objects unnecessarily
  Remove --kept-pack-only option and associated infrastructure
  pack-objects: only repack or loosen objects residing in "local" packs
  git-repack.sh: don't use --kept-pack-only option to pack-objects
  t7700-repack: add two new tests demonstrating repacking flaws
  is_kept_pack(): final clean-up
  Simplify is_kept_pack()
  Consolidate ignore_packed logic more
  has_sha1_kept_pack(): take "struct rev_info"
  has_sha1_pack(): refactor "pretend these packs do not exist" interface
  git-repack: resist stray environment variable

Conflicts:
t/t7700-repack.sh
builtin-count-objects.c
builtin-fsck.c
builtin-pack-objects.c
cache.h
diff.c
git-repack.sh
revision.c
revision.h
sha1_file.c
t/t7700-repack.sh