From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>,
John Cai via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, John Cai <johncai86@gmail.com>
Subject: Re: [PATCH 2/2] diff: teach diff to read gitattribute diff-algorithm
Date: Tue, 07 Feb 2023 22:05:29 +0100 [thread overview]
Message-ID: <230207.86bkm52n8x.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <xmqqcz6lyzhw.fsf@gitster.g>
On Tue, Feb 07 2023, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>
>>> 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
>>
>> That does look more elegant.
>
> We use attributes to define what it is, while configurations are
> used to define what to do on different things. The separation of
> attributes and configuration came not from "elegance" or "security"
> but from a lot more practical reasons.
>
> For a tracked file, the fact that it contains JSON text as payload
> does not change per user who cloned the project, or per platform the
> user used to do so. In-tree .gitattributes that the project
> controls is a perfect way to define what it is for each file.
>
> On the other hand, the diff program suitable to compare two JSON
> files may vary per platform (your favorite Windows program may not
> be available to me) and per user (a platform may support more than
> one and the choice becomes the matter of personal taste).
>
> The security aspect of giving users tighter control over which exact
> programs are to be run by not allowing the attributes or so called
> in-tree configuration mechansim is a small bonus that fell out as a
> consequence.
To clarify, I'm not suggesting that we ever read arbitrary parts of the
"diff.<driver>.<key>" config space, but that we could whitelist one set
of "diff.<driver>.<known-key>"="<known-values>".
The reason to do it being that, as Jeff points out, that config
mechanism is already established, and arguably more elegant. I.e. that
this is a natural fit for "diff=<driver>" in .gitattributes), and that
mechanism is already tied to config as Jeff's example shows.
Some of your reply seems like it assumed that I was suggesting that we
read "diff.algorithm" (i.e. a config setting to apply for all paths)
from an in-repo .gitconfig.
I wasn't suggesting that, nor that we open Pandora's box on starting a
limited in-repo .gitconfig support with anything remotely to do with
executing arbitrary commands (which the full "diff.<driver>.<key>" space
does support).
next prev parent reply other threads:[~2023-02-07 21:12 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 [this message]
2023-02-07 21:28 ` Junio C Hamano
2023-02-07 21:44 ` Ævar Arnfjörð Bjarmason
2023-02-09 16:34 ` John Cai
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=230207.86bkm52n8x.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johncai86@gmail.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).