From: Junio C Hamano <junkio@cox.net>
Date: Tue, 9 Jan 2007 19:50:53 +0000 (-0800)
Subject: Fix "Do not ignore a detected patchfile brokenness."
X-Git-Tag: v1.5.0-rc1~36^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6534141151f7fd4334f62827d9234acf3974ca4d;p=git.git

Fix "Do not ignore a detected patchfile brokenness."

Returning negative value from there does not stop the caller from using
the earlier part.

Noticed by Linus.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-apply.c b/builtin-apply.c
index 6a06be302..721d011bd 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -812,7 +812,8 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
 			struct fragment dummy;
 			if (parse_fragment_header(line, len, &dummy) < 0)
 				continue;
-			return error("patch fragment without header at line %d: %.*s", linenr, (int)len-1, line);
+			die("patch fragment without header at line %d: %.*s",
+			    linenr, (int)len-1, line);
 		}
 
 		if (size < len + 6)