Thread (7 messages) 7 messages, 5 authors, 2022-08-31

Re: js/add-p-diff-parsing-fix (was: What's cooking in git.git (Aug 2022, #10; Tue, 30))

From: Johannes Schindelin <hidden>
Date: 2022-08-31 19:54:42

Hi Phillip,

On Wed, 31 Aug 2022, Phillip Wood wrote:
On 31/08/2022 09:29, Ævar Arnfjörð Bjarmason wrote:
quoted
On Tue, Aug 30 2022, Junio C Hamano wrote:
quoted
* js/add-p-diff-parsing-fix (2022-08-29) 5 commits
  - add -p: ignore dirty submodules
  - add -p: handle `diff-so-fancy`'s hunk headers better
  - add -p: insert space in colored hunk header as needed
  - add -p: gracefully ignore unparseable hunk headers in colored diffs
  - t3701: redefine what is "bogus" output of a diff filter

  Those who use diff-so-fancy as the diff-filter noticed a regression
  or two in the reimplemented "add -p", which has been corrected.

  Will merge to 'next'?
  source: [ref]
This LGTM.
I'm not sure that the different output from the builtin version compared to
the perl version when using interactive.diffFilter is an improvement. The perl
version leaves the filtered output alone but the builtin version has started
prepending @@ -a,b +d,c @@ to the "hunk header" lines produced by the filter.
A convincing argument!

And after implementing this (and dropping the patches that implemented a
deviation from the Perl script's behavior), the patch series looks so much
more elegant, too!

Ciao,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help