mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  test-lib: fix broken printf
  git apply --directory broken for new files
This commit is contained in:
Shawn O. Pearce
2008-10-12 13:21:17 -07:00
parent b75271d93a 72d404deba
commit 5c283eb13c
3 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin-apply.c
View File

@ -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;