undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  apply: handle "traditional" creation/deletion diff correctly.
This commit is contained in:
Junio C Hamano 2006-11-04 03:54:20 -08:00
commit a622f6b35e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-apply.c
View File

@ -1043,10 +1043,14 @@ static int parse_single_patch(char *line, unsigned long size, struct patch *patc
* then not having oldlines means the patch is creation, * then not having oldlines means the patch is creation,
* and not having newlines means the patch is deletion. * and not having newlines means the patch is deletion.
*/ */
if (patch->is_new < 0 && !oldlines) if (patch->is_new < 0 && !oldlines) {
patch->is_new = 1; patch->is_new = 1;
if (patch->is_delete < 0 && !newlines) patch->old_name = NULL;
}
if (patch->is_delete < 0 && !newlines) {
patch->is_delete = 1; patch->is_delete = 1;
patch->new_name = NULL;
}
} }
if (0 < patch->is_new && oldlines) if (0 < patch->is_new && oldlines)