Merge branch 'jc/maint-unpack-objects-strict' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Aug 2009 00:21:55 +0000 (17:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Aug 2009 00:21:55 +0000 (17:21 -0700)
commit38eb7501aaddd72a8e6007f281d6a3cfa42a2a02
tree1008d78daab06ea7a595679cf61f8b530f8f55c4
parent0e24dc8d097c5c13fe3185d764415798c11fccd3
parent9a217391e931763d168d177decfe5e962d306bac
Merge branch 'jc/maint-unpack-objects-strict' into next

* jc/maint-unpack-objects-strict:
  Fix "unpack-objects --strict"

Conflicts:
builtin-unpack-objects.c
builtin-unpack-objects.c