]> rtime.felk.cvut.cz Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12dd2f6 212eb96)
Merge branch 'tr/maint-apply-non-git-patch-parsefix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Jun 2013 22:08:09 +0000 (15:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Jun 2013 22:08:09 +0000 (15:08 -0700)
Fix for the codepath to parse patches that add new files, generated
by programs other than Git.  THis is an old breakage in v1.7.11 and
will need to be merged down to the maintanance tracks.

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

1  2 
builtin/apply.c patch | diff1 | diff2 | blob | history

diff --cc builtin/apply.c
Simple merge
Git mirror and local development