]> Kevux Git Server - rit/commit
projects / rit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fca5ece 60cf761)
Merge branch 'pw/add-patch-with-suppress-blank-empty' into maint-2.46
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Aug 2024 19:50:53 +0000 (12:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Aug 2024 19:50:54 +0000 (12:50 -0700)
commit72a50fa03bb1f7ab3b7a1473dbfdc1b258f42cb7
tree04737210830cb20b1d7ef77981f34aa752e30a89tree | snapshot
parentfca5ece27880b0d4f350d89fdf06e35a927ab547commit | diff
parent60cf761ed14298d618597e87e50f25bb61171e84commit | diff
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
add-patch.c diff1 | diff2 | blob | history
t/t3701-add-interactive.sh diff1 | diff2 | blob | history
Git without Rust.