On Fri, 2023-11-24 at 11:02 +0100, Phil Sutter wrote: > On Fri, Nov 24, 2023 at 10:33:50AM +0100, Pablo Neira Ayuso wrote: > > On Fri, Nov 24, 2023 at 09:49:51AM +0100, Florian Westphal wrote: > > > Phil Sutter <phil@xxxxxx> wrote: > > > > The stored JSON dumps containing a single line of a thusand > > > > characters > > > > in average mess up diffs in history and patches if they change. > > > > Mitigate > > > > this by treating them as binary files. > > > > > > > > In order to get useable diffs back, one may undo/override the > > > > attribute > > > > within $GIT_DIR/info/attributes, preferrably by defining a > > > > custom diff > > > > driver converting the single-line dumps into something > > > > digestable by > > > > diff: > > > > > > I'd say we convert the single-line dumps to jq format one-by-one > > > if they need updating. > > This might work without a transitioning mechanism if jq output piped > through jq does not change. The testsuite could just pipe the dump > through jq before comparing regardless of whether it's pretty-printed > already or not. > > > I am also fine with .json-nft dumps in pretty format too, which is > > friendlier to git diff. > > Discuss that with Thomas, please. I tried and failed, alleviating the > effects is my last resort. > > Cheers, Phil > Hi, let me send a patch, that hopefully makes you all happy. (or at least, something to discuss further). Hold on. Thomas
