development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues 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
parent 6768d6b847 6f9f3b263b
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,
* 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;
if (patch->is_delete < 0 && !newlines)
patch->old_name = NULL;
}
if (patch->is_delete < 0 && !newlines) {
patch->is_delete = 1;
patch->new_name = NULL;
}
}
if (0 < patch->is_new && oldlines)