From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Mar 2026 20:57:00 +0000 (-0700)
Subject: Merge branch 'jw/apply-corrupt-location'
X-Git-Tag: v2.54.0-rc0~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5032e70fc25ff18a3c16fb89d708884104c2d1a3;p=thirdparty%2Fgit.git

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

5032e70fc25ff18a3c16fb89d708884104c2d1a3