]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29b2f05 212eb96)
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)
"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

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

diff --cc builtin/apply.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.