From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Florian Westphal <fw@strlen.de>
Cc: Phil Sutter <phil@nwl.cc>,
netfilter-devel@vger.kernel.org,
Thomas Haller <thaller@redhat.com>
Subject: Re: [nft PATCH] tests/shell: Treat json-nft dumps as binary in git
Date: Fri, 24 Nov 2023 10:33:50 +0100 [thread overview]
Message-ID: <ZWBt/seCFvaAdvcO@calendula> (raw)
In-Reply-To: <20231124084951.GA8873@breakpoint.cc>
On Fri, Nov 24, 2023 at 09:49:51AM +0100, Florian Westphal wrote:
> Phil Sutter <phil@nwl.cc> 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.
I am also fine with .json-nft dumps in pretty format too, which is
friendlier to git diff.
next prev parent reply other threads:[~2023-11-24 9:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-23 14:37 [nft PATCH] tests/shell: Treat json-nft dumps as binary in git Phil Sutter
2023-11-24 8:49 ` Florian Westphal
2023-11-24 9:33 ` Pablo Neira Ayuso [this message]
2023-11-24 10:02 ` Phil Sutter
2023-11-24 10:39 ` Thomas Haller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZWBt/seCFvaAdvcO@calendula \
--to=pablo@netfilter.org \
--cc=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
--cc=phil@nwl.cc \
--cc=thaller@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.