Merge branch 'jc/hash-object' into next
commit9b81a0620977ee48bfb9c29d1855961cd7d2fd41
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 May 2015 20:21:09 +0000 (7 13:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 May 2015 20:21:10 +0000 (7 13:21 -0700)
tree58eb7117200b52ef925b18b242a2a22c7a319bda
parent64f15a8c40d494fb132573a97943f472db5b5117
parent1427a7ff70bce0c1040831d5d674c83ebcda6d7d
Merge branch 'jc/hash-object' into next

"hash-object --literally" introduced in v2.2 was not prepared to
take a really long object type name.

* jc/hash-object:
  write_sha1_file(): do not use a separate sha1[] array
  t1007: add hash-object --literally tests
  hash-object --literally: fix buffer overrun with extra-long object type
  git-hash-object.txt: document --literally option
builtin/hash-object.c
cache.h
sha1_file.c
t/t1007-hash-object.sh