]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2794ac1 60cf761)
Merge branch 'pw/add-patch-with-suppress-blank-empty'
authorJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2024 20:34:17 +0000 (13:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2024 20:34:17 +0000 (13:34 -0700)
commitd71121c060dc1a76cb5be1674e4f719f5c58136e
treeb9ce9ca630f467d8c67876e4d0a777a079d5f497tree | snapshot
parent2794ac123d2d0498878d8e47ff4a2e1675557317commit | diff
parent60cf761ed14298d618597e87e50f25bb61171e84commit | diff
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
add-patch.c diff1 | diff2 | blob | history
t/t3701-add-interactive.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.