Merge branch 'jk/pretty-commit-header-incomplete-line' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 20:01:33 +0000 (13:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 20:01:33 +0000 (13:01 -0700)
By Jeff King
* jk/pretty-commit-header-incomplete-line:
  avoid segfault when reading header of malformed commits

1  2 
pretty.c

diff --cc pretty.c
Simple merge