Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:24 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:24 +0000 (10:49 -0700)
* jm/maint-apply-detects-corrupt-patch-header:
  fix "git apply --index ..." not to deref NULL

1  2 
builtin/apply.c

diff --cc builtin/apply.c
Simple merge