Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Jul 2013 17:36:14 +0000 (10:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Jul 2013 17:36:14 +0000 (10:36 -0700)
commit90360c710c4105e3bce74fc2d746c4fa48bf07e7
tree24fd9f59b7c7eab53cb7c0f493272cb598de2724
parent29b2f0565a1e3fdd6ef40d6e12e211757071ef56
parent212eb96a96e256933a76e48d85fa4f500bed0dee
Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maint

"git apply" parsed patches that add new files, generated by programs
other than Git, incorrectly.  This is an old breakage in v1.7.11.

* tr/maint-apply-non-git-patch-parsefix:
  apply: carefully strdup a possibly-NULL name
builtin/apply.c