From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2008 03:19:30 +0000 (-0700)
Subject: Merge branch 'np/pack'
X-Git-Tag: v1.6.1-rc1~229
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c4398286fa5245cf54d73f6016444179d73f140b?hp=c4398286fa5245cf54d73f6016444179d73f140b

Merge branch 'np/pack'

* np/pack:
t5300: improve SHA1 collision test
pack-objects: don't include missing preferred base objects
sha1write: don't copy full sized buffers

Conflicts:
t/t5300-pack-object.sh
---