diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-30 13:57:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-30 13:57:00 -0700 |
| commit | 5032e70fc25ff18a3c16fb89d708884104c2d1a3 (patch) | |
| tree | a1a2f666f1042c36adbe8b66d86973139f917595 /range-diff.c | |
| parent | 295eb2cc473675bafb1b523696a442e6969ccd41 (diff) | |
| parent | 2ef795b027c10f5e253151106a6fb4265552cc04 (diff) | |
| download | git-5032e70fc25ff18a3c16fb89d708884104c2d1a3.tar.xz | |
Merge branch 'jw/apply-corrupt-location'
"git apply" now reports the name of the input file along with the
line number when it encounters a corrupt patch, and correctly
resets the line counter when processing multiple patch files.
* jw/apply-corrupt-location:
apply: report input location in binary and garbage patch errors
apply: report input location in header parsing errors
apply: report the location of corrupt patches
Diffstat (limited to 'range-diff.c')
| -rw-r--r-- | range-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/range-diff.c b/range-diff.c index 57edff40a8..2712a9a107 100644 --- a/range-diff.c +++ b/range-diff.c @@ -140,7 +140,7 @@ static int read_patches(const char *range, struct string_list *list, if (eol) *eol = '\n'; orig_len = len; - len = parse_git_diff_header(&root, &linenr, 0, line, + len = parse_git_diff_header(&root, NULL, &linenr, 0, line, len, size, &patch); if (len < 0) { error(_("could not parse git header '%.*s'"), |