Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jul 2014 18:31:46 +0000 (11:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jul 2014 18:31:46 +0000 (11:31 -0700)
* maint:
t4013: test diff-tree's --stdin commit formatting
diff-tree: avoid lookup_unknown_object
object_as_type: set commit index
alloc: factor out commit index
add object_as_type helper for casting objects
parse_object_buffer: do not set object type
move setting of object->type to alloc_* functions
alloc: write out allocator definitions
alloc.c: remove the alloc_raw_commit_node() function

1  2 
t/t4013-diff-various.sh
Simple merge