From: John Cai <johncai86@gmail.com>
To: Jeff King <peff@peff.net>
Cc: "John Cai via GitGitGadget" <gitgitgadget@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 2/2] diff: teach diff to read gitattribute diff-algorithm
Date: Thu, 9 Feb 2023 11:34:00 -0500 [thread overview]
Message-ID: <20230209163400.xi7j3ivd4k6gqoc7@jcai-ubuntu> (raw)
In-Reply-To: <Y+KQtqNPews3vBS8@coredump.intra.peff.net>
On 23/02/07 12:56PM, Jeff King wrote:
> On Sun, Feb 05, 2023 at 03:46:21AM +0000, John Cai via GitGitGadget wrote:
>
> > +`diff-algorithm`
> > +^^^^^^^^^^^^^^^^
> > +
> > +The attribute `diff-algorithm` affects which algorithm Git uses to generate
> > +diffs. This allows defining diff algorithms per file extension. Precedence rules
> > +are as follows, in order from highest to lowest:
> > +
> > +*Command line option*
> > +
> > +Pass in the `--diff-algorithm` command line option int git-diff(1)
> > +
> > +*Git attributes*
> > +
> > +------------------------
> > +*.json diff-algorithm=histogram
> > +------------------------
> > +
> > +*Git config*
> > +
> > +----------------------------------------------------------------
> > +[diff]
> > + algorithm = histogram
> > +----------------------------------------------------------------
>
> From the user's perspective, this is weirdly inconsistent with the
> existing diff attributes, which would be more like:
>
> # in .gitattributes
> *.json diff=json
>
> # in config
> [diff "json"]
> algorithm = histogram
Thanks for this suggestion, Peff. What I like about this is that it builds off
of the existing diff.<driver> scheme rather than inventing another one.
Additionally, we won't get hit with a performance penalty since we already read
gitattrbitues to see if a driver has been set or not.
Thinking out loud, if we add "algorithm" as a key for diff.<driver>, it would be
mutually exclusive with "command" where "command" takes precedence, correct?
>
> I know why one might choose the scheme you did; it kicks in if the repo
> sets the algorithm, without users having to set up any extra config.
> Which is sort of nice, if we assume that malicious actors don't have any
> incentive to pick the algorithm. In theory they don't, though I saw Ævar
> mention possible DoS elsewhere in the thread.
>
> Side note: It's also possible that algorithm selection could be
> required to trigger a separate security bug (say, a buffer overflow in
> the patience code or something), so restricting that works in a
> belt-and-suspenders way. But that somehow feels like like the wrong
> side of the paranoia-vs-feature line.
>
> So I dunno. I recognize that this scheme fulfills your immediate needs
> better, but I fear that we'll be stuck with a weird split between "diff"
> and "diff-*" attributes forever. In the long run, having a way for the
> repo to say "and here is some config I recommend to you" would give you
> the best of both, but that is a challenging topic that has been
> discussed and punted on for many years.
>
> -Peff
next prev parent reply other threads:[~2023-02-09 16:34 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-05 3:46 [PATCH 0/2] Teach diff to honor diff algorithms set through git attributes John Cai via GitGitGadget
2023-02-05 3:46 ` [PATCH 1/2] diff: consolidate diff algorithm option parsing John Cai via GitGitGadget
2023-02-06 16:20 ` Phillip Wood
2023-02-05 3:46 ` [PATCH 2/2] diff: teach diff to read gitattribute diff-algorithm John Cai via GitGitGadget
2023-02-05 17:50 ` Eric Sunshine
2023-02-06 13:10 ` John Cai
2023-02-06 16:27 ` Phillip Wood
2023-02-06 18:14 ` Eric Sunshine
2023-02-06 19:50 ` John Cai
2023-02-09 8:26 ` Elijah Newren
2023-02-09 10:31 ` "bad" diffs (was: [PATCH 2/2] diff: teach diff to read gitattribute diff-algorithm) Ævar Arnfjörð Bjarmason
2023-02-09 16:37 ` [PATCH 2/2] diff: teach diff to read gitattribute diff-algorithm John Cai
2023-02-06 16:39 ` Ævar Arnfjörð Bjarmason
2023-02-06 20:37 ` John Cai
2023-02-07 14:55 ` Phillip Wood
2023-02-07 17:00 ` John Cai
2023-02-09 9:09 ` Elijah Newren
2023-02-09 14:44 ` Phillip Wood
2023-02-10 9:57 ` Elijah Newren
2023-02-11 17:39 ` Phillip Wood
2023-02-11 1:59 ` Jeff King
2023-02-15 2:35 ` Elijah Newren
2023-02-15 4:21 ` Jeff King
2023-02-15 5:20 ` Junio C Hamano
2023-02-15 14:44 ` Phillip Wood
2023-02-15 15:00 ` Jeff King
2023-02-07 17:27 ` Ævar Arnfjörð Bjarmason
2023-02-15 14:47 ` Phillip Wood
2023-02-09 8:44 ` Elijah Newren
2023-02-14 21:16 ` John Cai
2023-02-15 3:41 ` Elijah Newren
2023-02-09 7:50 ` Elijah Newren
2023-02-09 9:41 ` Ævar Arnfjörð Bjarmason
2023-02-11 2:04 ` Jeff King
2023-02-07 17:56 ` Jeff King
2023-02-07 20:18 ` Ævar Arnfjörð Bjarmason
2023-02-07 20:47 ` Junio C Hamano
2023-02-07 21:05 ` Ævar Arnfjörð Bjarmason
2023-02-07 21:28 ` Junio C Hamano
2023-02-07 21:44 ` Ævar Arnfjörð Bjarmason
2023-02-09 16:34 ` John Cai [this message]
2023-02-11 1:39 ` Jeff King
2023-02-14 21:40 ` [PATCH v2 0/2] Teach diff to honor diff algorithms set through git attributes John Cai via GitGitGadget
2023-02-14 21:40 ` [PATCH v2 1/2] diff: consolidate diff algorithm option parsing John Cai via GitGitGadget
2023-02-15 2:38 ` Junio C Hamano
2023-02-15 23:34 ` John Cai
2023-02-15 23:42 ` Junio C Hamano
2023-02-16 2:14 ` Jeff King
2023-02-16 2:57 ` Junio C Hamano
2023-02-16 20:34 ` John Cai
2023-02-14 21:40 ` [PATCH v2 2/2] diff: teach diff to read gitattribute diff-algorithm John Cai via GitGitGadget
2023-02-15 2:56 ` Junio C Hamano
2023-02-15 3:20 ` Junio C Hamano
2023-02-16 20:37 ` John Cai
2023-02-17 20:21 ` [PATCH v3 0/2] Teach diff to honor diff algorithms set through git attributes John Cai via GitGitGadget
2023-02-17 20:21 ` [PATCH v3 1/2] diff: consolidate diff algorithm option parsing John Cai via GitGitGadget
2023-02-17 21:27 ` Junio C Hamano
2023-02-18 1:36 ` Elijah Newren
2023-02-17 20:21 ` [PATCH v3 2/2] diff: teach diff to read algorithm from diff driver John Cai via GitGitGadget
2023-02-17 21:50 ` Junio C Hamano
2023-02-18 2:56 ` Elijah Newren
2023-02-20 15:32 ` John Cai
2023-02-20 16:21 ` Elijah Newren
2023-02-20 16:49 ` John Cai
2023-02-20 17:32 ` Elijah Newren
2023-02-20 20:53 ` John Cai
2023-02-22 19:47 ` Jeff King
2023-02-24 17:44 ` John Cai
2023-02-18 1:16 ` [PATCH v3 0/2] Teach diff to honor diff algorithms set through git attributes Elijah Newren
2023-02-20 13:37 ` John Cai
2023-02-20 21:04 ` [PATCH v4 " John Cai via GitGitGadget
2023-02-20 21:04 ` [PATCH v4 1/2] diff: consolidate diff algorithm option parsing John Cai via GitGitGadget
2023-02-20 21:04 ` [PATCH v4 2/2] diff: teach diff to read algorithm from diff driver John Cai via GitGitGadget
2023-02-21 17:34 ` [PATCH v4 0/2] Teach diff to honor diff algorithms set through git attributes Junio C Hamano
2023-02-21 18:05 ` Elijah Newren
2023-02-21 18:51 ` Junio C Hamano
2023-02-21 19:36 ` John Cai
2023-02-21 20:16 ` Elijah Newren
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=20230209163400.xi7j3ivd4k6gqoc7@jcai-ubuntu \
--to=johncai86@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).