diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-12 20:21:17 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-12 20:21:17 (GMT) |
| commit | 5c283eb13c94be6ca974aa722159dc9838d10d97 (patch) | |
| tree | e10f2dfa699ffe69b2b5e9a215c905b76ee4e77c /builtin-apply.c | |
| parent | b75271d93a9e4be960d53fc4f955802530e0e733 (diff) | |
| parent | 72d404debaa804fca82fd9cf710fbde48c7305c6 (diff) | |
| download | git-5c283eb13c94be6ca974aa722159dc9838d10d97.zip git-5c283eb13c94be6ca974aa722159dc9838d10d97.tar.gz git-5c283eb13c94be6ca974aa722159dc9838d10d97.tar.bz2 | |
Merge branch 'maint'
* maint:
test-lib: fix broken printf
git apply --directory broken for new files
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index f1f6758..cfd8fce 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -805,6 +805,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; |