apply: handle "traditional" creation/deletion diff correctly.
We deduced a GNU diff output that does not use /dev/null convention as creation (deletion) diff correctly by looking at the lack of context and deleted lines (added lines), but forgot to reset the new (old) name field properly. This was a regression when we added a workaround for --unified=0 insanity. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Nov 4, 2006 at 02:28 UTC
6f9f3b263b1c86889d6fae0d50c75be0f3227003
1 file changed
+6
-2
builtin-apply.c
+6
-2
@@ -1043,10 +1043,14 @@ static int parse_single_patch(char *line, unsigned long size, struct patch *patc
1043
* then not having oldlines means the patch is creation,
1044
* and not having newlines means the patch is deletion.
1045
*/
1046
- if (patch->is_new < 0 && !oldlines)
1046
+ if (patch->is_new < 0 && !oldlines) {
1047
patch->is_new = 1;
1048
- if (patch->is_delete < 0 && !newlines)
1048
+ patch->old_name = NULL;
1049
+ }
1050
+ if (patch->is_delete < 0 && !newlines) {
1051
patch->is_delete = 1;
1052
+ patch->new_name = NULL;
1053
+ }
1054
}
1055
1056
if (0 < patch->is_new && oldlines)