diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-09 11:50:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-09 11:50:53 -0800 |
| commit | 6534141151f7fd4334f62827d9234acf3974ca4d (patch) | |
| tree | d2d1a6e886d7cf73bccf24b4f538c1cb7a281171 /builtin-apply.c | |
| parent | 5a17b54ad5543ddca60a493c613801279cc98a34 (diff) | |
| download | git-6534141151f7fd4334f62827d9234acf3974ca4d.tar.gz | |
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>
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 6a06be3025..721d011bd0 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) |