tree 2eaff9fe76a30f4ee40c3bf9bf1beca1b4e67afd
parent 3f3e2c26fa0325f4df952363f8f5046ca8158bb3
parent 094085e3362c592c932b41525ed37152ec171192
author Junio C Hamano <gitster@pobox.com> 1241388091 -0700
committer Junio C Hamano <gitster@pobox.com> 1241388091 -0700

Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1

* 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