Merge branch 'jc/maint-unpack-objects-strict'
commitab36d06f12b7243de419bb82b11a678bea30eef2
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Aug 2009 23:59:08 +0000 (27 16:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Aug 2009 23:59:08 +0000 (27 16:59 -0700)
tree7f74ade9f26a4a809835002d84c389156826b0cf
parentc3f0cadfa8a99099a3a7852d717867924ba45106
parent9a217391e931763d168d177decfe5e962d306bac
Merge branch 'jc/maint-unpack-objects-strict'

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

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