author | Junio C Hamano <gitster@pobox.com> | |
Wed, 3 Dec 2008 07:00:04 +0000 (23:00 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 3 Dec 2008 07:00:04 +0000 (23:00 -0800) | ||
commit | 0fd9d7e66deb7071da2a568b96c94f94ee890908 | |
tree | e8af2cdc7eee0aaa92087e7e798aa8d1c0d6acf1 | tree | snapshot |
parent | e23f6822df5ee0acfe244c819a419c3e7c8c9e7e | commit | diff |
parent | 83d0289df6fb4deae100ee3fc37b90683c2e8c9f | commit | diff |
Merge branch 'bc/maint-keep-pack' into maint
* bc/maint-keep-pack:
repack: only unpack-unreachable if we are deleting redundant packs
t7700: test that 'repack -a' packs alternate packed objects
pack-objects: extend --local to mean ignore non-local loose objects too
sha1_file.c: split has_loose_object() into local and non-local counterparts
t7700: demonstrate mishandling of loose objects in an alternate ODB
builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
repack: do not fall back to incremental repacking with [-a|-A]
repack: don't repack local objects in packs with .keep file
pack-objects: new option --honor-pack-keep
packed_git: convert pack_local flag into a bitfield and add pack_keep
t7700: demonstrate mishandling of objects in packs with a .keep file
* bc/maint-keep-pack:
repack: only unpack-unreachable if we are deleting redundant packs
t7700: test that 'repack -a' packs alternate packed objects
pack-objects: extend --local to mean ignore non-local loose objects too
sha1_file.c: split has_loose_object() into local and non-local counterparts
t7700: demonstrate mishandling of loose objects in an alternate ODB
builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
repack: do not fall back to incremental repacking with [-a|-A]
repack: don't repack local objects in packs with .keep file
pack-objects: new option --honor-pack-keep
packed_git: convert pack_local flag into a bitfield and add pack_keep
t7700: demonstrate mishandling of objects in packs with a .keep file
builtin-pack-objects.c | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
sha1_file.c | diff1 | | diff2 | | blob | history |