author | Junio C Hamano <gitster@pobox.com> | |
Thu, 13 Nov 2008 06:00:43 +0000 (22:00 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 13 Nov 2008 06:00:43 +0000 (22:00 -0800) | ||
commit | ecbbfb15a42987deb6620c4575c420002313af23 | |
tree | 541cc88566a9cac6f8bf473c31879bf536f71c5c | tree | snapshot |
parent | a5b2d4ac24ef18cf8c628e258bef8a20d9bf4b2b | commit | diff |
parent | 3289b9dec56d34fe05f90c262d11adc0a61e16e7 | commit | diff |
Merge branch 'bc/maint-keep-pack'
* bc/maint-keep-pack:
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:
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-gc.c | diff1 | | diff2 | | blob | history |
builtin-pack-objects.c | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
sha1_file.c | diff1 | | diff2 | | blob | history |