Merge branch 'jc/maint-unpack-objects-strict' into maint
commitaf4f6405296dec699321ca59d48583ffa0323b0e
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Sep 2009 21:45:18 +0000 (16 14:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Sep 2009 21:45:18 +0000 (16 14:45 -0700)
tree8858983d81b0eef76eb55d21a0d96b7b16846eca
parent6674d310d179400358d581f9725cbd4a2c32e3bf
parent9a217391e931763d168d177decfe5e962d306bac
Merge branch 'jc/maint-unpack-objects-strict' into maint

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

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