]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aef5881 2ef795b)
Merge branch 'jw/apply-corrupt-location' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2026 17:03:57 +0000 (10:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2026 17:03:57 +0000 (10:03 -0700)
commit18e9b8f91fdfdcd6aedb5e5b1c3541ab84b04433
tree58500ac358040532335fc0c897b80bc74448b45ctree | snapshot
parentaef58811091ead010da1c5dc590e2731c9cbcefecommit | diff
parent2ef795b027c10f5e253151106a6fb4265552cc04commit | diff
Merge branch 'jw/apply-corrupt-location' into next

"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
apply.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.