From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Aug 2024 19:50:53 +0000 (-0700)
Subject: Merge branch 'pw/add-patch-with-suppress-blank-empty' into maint-2.46
X-Git-Tag: v2.46.1~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72a50fa03bb1f7ab3b7a1473dbfdc1b258f42cb7;p=thirdparty%2Fgit.git

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

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

72a50fa03bb1f7ab3b7a1473dbfdc1b258f42cb7