From 969c877506cf8cc760c7b251fef6c5b6850bfc19 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 12 Oct 2008 00:06:11 -0400 Subject: git apply --directory broken for new files We carefully verify that the input to git-apply is sane, including cross-checking that the filenames we see in "+++" headers match what was provided on the command line of "diff --git". When --directory is used, however, we ended up comparing the unadorned name to one with the prepended root, causing us to complain about a mismatch. We simply need to prepend the root directory, if any, when pulling the name out of the git header. Signed-off-by: Jeff King Acked-by: Junio C Hamano Signed-off-by: Shawn O. Pearce --- builtin-apply.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'builtin-apply.c') diff --git a/builtin-apply.c b/builtin-apply.c index 74f7e7924..e9d49f133 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -810,6 +810,13 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch * the default name from the header. */ patch->def_name = git_header_name(line, len); + if (patch->def_name && root) { + char *s = xmalloc(root_len + strlen(patch->def_name) + 1); + strcpy(s, root); + strcpy(s + root_len, patch->def_name); + free(patch->def_name); + patch->def_name = s; + } line += len; size -= len; -- cgit v1.2.1