From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 31 Jul 2024 20:34:17 +0000 (-0700)
Subject: Merge branch 'pw/add-patch-with-suppress-blank-empty'
X-Git-Tag: v2.47.0-rc0~174
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d71121c060dc1a76cb5be1674e4f719f5c58136e;p=thirdparty%2Fgit.git

Merge branch 'pw/add-patch-with-suppress-blank-empty'

"git add -p" by users with diff.suppressBlankEmpty set to true
failed to parse the patch that represents an unmodified empty line
with an empty line (not a line with a single space on it), which
has been corrected.

* pw/add-patch-with-suppress-blank-empty:
  add-patch: use normalize_marker() when recounting edited hunk
  add-patch: handle splitting hunks with diff.suppressBlankEmpty
---

d71121c060dc1a76cb5be1674e4f719f5c58136e