From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Jul 2011 16:54:51 +0000 (-0700)
Subject: Merge branch 'jc/index-pack'
X-Git-Tag: v1.7.7-rc0~85
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d907bf8ef327cd47433d4a4bb0a1bb4e96b6e340?ds=inline;hp=d907bf8ef327cd47433d4a4bb0a1bb4e96b6e340

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
---