granicus.if.org Git - git/commit

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

* 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

Conflicts:
t/t7700-repack.sh

author	Junio C Hamano <gitster@pobox.com>
	Thu, 2 Apr 2009 05:34:19 +0000 (22:34 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 2 Apr 2009 05:34:19 +0000 (22:34 -0700)
commit	3c91bf6805249d0f59ddff4e5dc4118127527243
tree	8f07aa193c5206f736c1dbe2e3ac688938704636	tree \| snapshot
parent	988d9fd8a42b388c30625378dcb521a3b2021b72	commit \| diff
parent	094085e3362c592c932b41525ed37152ec171192	commit \| diff

builtin-pack-objects.c	diff1 \|	diff2 \|	blob \| history
cache.h	diff1 \|	diff2 \|	blob \| history
git-repack.sh	diff1 \|	diff2 \|	blob \| history
revision.c	diff1 \|	diff2 \|	blob \| history
revision.h	diff1 \|	diff2 \|	blob \| history
sha1_file.c	diff1 \|	diff2 \|	blob \| history
t/t7700-repack.sh	diff1 \|	diff2 \|	blob \| history