Re: Problem with git-apply?

From: Junio C Hamano <junkio@cox.net>
Date: Nov 4, 2006, 10:15 UTC
Message-ID: <7vu01f34bo.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <7v4ptf4jmj.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> writes:

Show 6 quoted lines

> *BLUSH*  A prime example of "you should not speak before
> thinking".
>
> Please forget everything I said.  The patch parsing is just fine
> with or without "/dev/null".  This must be a recent breakage
> around write_out_one_result().  Will take a look.

Actually it was a small problem in the patch parsing code. Can you give this a try?

---

diff --git a/builtin-apply.c b/builtin-apply.c
index 11397f5..db7cdce 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -1043,10 +1043,14 @@ static int parse_single_patch(char *line
 		 * 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)