Merge branch 'np/pack'
commitc4398286fa5245cf54d73f6016444179d73f140b
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2008 03:19:30 +0000 (18 20:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2008 03:19:30 +0000 (18 20:19 -0700)
tree7615ae9e816ae37148e70e335a1d95a54216e890
parent8435bdfdc3dca1b19721e013374d936164928e33
parent5f020f720298ddba537f857a240ffa7debb05f54
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
builtin-pack-objects.c
t/t5300-pack-object.sh