From: Junio C Hamano <junkio@cox.net>
Date: Sat, 4 Nov 2006 11:54:20 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.4-rc1~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a622f6b35eb72b0ce738c03d6b49f760501bce78?hp=6768d6b8477db41a1cfdbd1d81ac8c5131c58e1d

Merge branch 'maint'

* maint:
apply: handle "traditional" creation/deletion diff correctly.
---

diff --git a/builtin-apply.c b/builtin-apply.c
index 11397f5504..db7cdce1d3 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -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)