Merge branch 'maint'

* maint:
  Fix "Do not ignore a detected patchfile brokenness."
  Do not ignore a detected patchfile brokenness.
This commit is contained in:
Junio C Hamano 2007-01-09 12:04:30 -08:00
commit 240897e908

View File

@ -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)