]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44a92de ffe5c33)
Merge branch 'zy/apply-abandoned-header-fix' into seen
authorJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2026 23:20:58 +0000 (16:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2026 23:20:58 +0000 (16:20 -0700)
A candidate 'git diff' header parsed by 'git apply' has been isolated
in a temporary structure, preventing any partially parsed state from
polluting the main patch structure and causing assertions to trip if
the header is ultimately rejected.

* zy/apply-abandoned-header-fix:
  apply: avoid leaking abandoned git-header state

1  2 
apply.c patch | diff1 | diff2 | blob | history

diff --cc apply.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.