pr-1336/dscho/diff-so-fancy-v3
tagged this
29 Aug 15:11
Philippe Blain reported in https://lore.kernel.org/git/ecf6f5be-22ca-299f-a8f1-bda38e5ca246@gmail.com that there is a problem when running the built-in version of git add -p with diff-so-fancy [https://github.com/so-fancy/diff-so-fancy] as diff colorizer. The symptom is this: error: could not parse colored hunk header '?[36m?[1m?[38;5;13m@ file:1 @?[1m?[0m' This patch series addresses that and should fix https://github.com/so-fancy/diff-so-fancy/issues/437 Changes since v2: * Added the appropriate "Reported-by" trailer to the commit message. * Split out the logic to insert a space between the colored line range and the extra information, if needed. * That logic was now corrected to see whether that space is really needed. * To verify that the logic does what we need it to do, the added regression test now specifically tests for that (single) extra space that we want to be inserted. * Reworded a stale comment that claimed that we might suppress the entire colored hunk header (which we no longer do). * Rebased to the current tip of the main branch to avoid a merge conflict with 716c1f649e3 (pipe_command(): mark stdin descriptor as non-blocking, 2022-08-17). Changes since v1: * Added a commit to ignore dirty submodules just like the Perl version does. Johannes Schindelin (5): t3701: redefine what is "bogus" output of a diff filter add -p: gracefully ignore unparseable hunk headers in colored diffs add -p: insert space in colored hunk header as needed add -p: handle `diff-so-fancy`'s hunk headers better add -p: ignore dirty submodules add-patch.c | 49 ++++++++++++++++++++++++++++++-------- t/t3701-add-interactive.sh | 35 ++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 11 deletions(-) base-commit: 07ee72db0e97b5c233f8ada0abb412248c2f1c6f Submitted-As: https://lore.kernel.org/git/pull.1336.v3.git.1661785916.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1336.git.1661277870.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1336.v2.git.1661376112.gitgitgadget@gmail.com
Assets 2
-
2022-08-29T15:11:57Z -
2022-08-29T15:11:57Z - Loading