diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-09 12:04:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-09 12:04:30 -0800 |
| commit | 240897e908e48e8f8c8d5555522afe255b3b734b (patch) | |
| tree | 3dc44694521cd6cde6752907140beff90e3395d6 /builtin-apply.c | |
| parent | 1295228d1fdda17c2ef62e712649c962c3da5eb7 (diff) | |
| parent | 6534141151f7fd4334f62827d9234acf3974ca4d (diff) | |
| download | git-240897e908e48e8f8c8d5555522afe255b3b734b.tar.gz git-240897e908e48e8f8c8d5555522afe255b3b734b.tar.xz | |
Merge branch 'maint'
* maint:
Fix "Do not ignore a detected patchfile brokenness."
Do not ignore a detected patchfile brokenness.
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 1c3583706..38a9fdd80 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -811,7 +811,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; - 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) |