aboutsummaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-10-12 00:06:11 -0400
committerShawn O. Pearce <spearce@spearce.org>2008-10-12 11:09:41 -0700
commit969c877506cf8cc760c7b251fef6c5b6850bfc19 (patch)
tree641fc1ff05577feac95f81d139637e726ac9848f /builtin-apply.c
parentff74126c03a8dfd04e7533573a5c420f2a7112ac (diff)
downloadgit-969c877506cf8cc760c7b251fef6c5b6850bfc19.tar.gz
git-969c877506cf8cc760c7b251fef6c5b6850bfc19.tar.xz
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 <peff@peff.net> Acked-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c7
1 files changed, 7 insertions, 0 deletions
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;