]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'zy/apply-abandoned-header-fix' into seen
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2026 17:44:35 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2026 17:44:35 +0000 (10:44 -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

diff --cc apply.c
Simple merge