Merge branch 'jc/index-pack'
commitd907bf8ef327cd47433d4a4bb0a1bb4e96b6e340
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2011 16:54:51 +0000 (19 09:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2011 16:54:51 +0000 (19 09:54 -0700)
tree2475a33111f13c32a4e8540fb9d273bee0c5c601
parent54dbc1f9e6451b6673835259ce8aa450489fc420
parent3de89c9d4216d0fdc11bd1141c419ac4d0d35fed
Merge branch 'jc/index-pack'

* jc/index-pack:
  verify-pack: use index-pack --verify
  index-pack: show histogram when emulating "verify-pack -v"
  index-pack: start learning to emulate "verify-pack -v"
  index-pack: a miniscule refactor
  index-pack --verify: read anomalous offsets from v2 idx file
  write_idx_file: need_large_offset() helper function
  index-pack: --verify
  write_idx_file: introduce a struct to hold idx customization options
  index-pack: group the delta-base array entries also by type

Conflicts:
builtin/verify-pack.c
cache.h
sha1_file.c
builtin/index-pack.c
builtin/pack-objects.c
cache.h
csum-file.c
fast-import.c
sha1_file.c