summaryrefslogtreecommitdiff
path: root/builtin/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-26 22:08:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-26 22:08:09 (GMT)
commitad76feb55eb7645661421e213796129efcbb7d56 (patch)
tree6b1d643c3e8fa2b17a4e85a5d37496208a460a60 /builtin/apply.c
parent12dd2f69337e29254e743aa6fb3b04937f302209 (diff)
parent212eb96a96e256933a76e48d85fa4f500bed0dee (diff)
downloadgit-ad76feb55eb7645661421e213796129efcbb7d56.zip
git-ad76feb55eb7645661421e213796129efcbb7d56.tar.gz
git-ad76feb55eb7645661421e213796129efcbb7d56.tar.bz2
Merge branch 'tr/maint-apply-non-git-patch-parsefix'
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
Diffstat (limited to 'builtin/apply.c')
-rw-r--r--builtin/apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index faf8e30..0e9b631 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -906,7 +906,7 @@ static void parse_traditional_patch(const char *first, const char *second, struc
patch->old_name = name;
} else {
patch->old_name = name;
- patch->new_name = xstrdup(name);
+ patch->new_name = null_strdup(name);
}
}
if (!name)