From: ydirson@free.fr
To: Junio C Hamano <gitster@pobox.com>
Cc: git <git@vger.kernel.org>
Subject: Re: [BUG] diff algorithm selection issue
Date: Tue, 26 May 2020 19:21:27 +0200 (CEST) [thread overview]
Message-ID: <505382066.1036329918.1590513687177.JavaMail.root@zimbra39-e7> (raw)
In-Reply-To: <253380167.1036247407.1590512216359.JavaMail.root@zimbra39-e7>
> > > When the config has diff.algorithm=patience set, "git diff
> > > --minimal" seems to
> > > be ignored, and does not give the same output as "git diff
> > > --diff-algorithm=minimal",
> > > but really the same as "git diff --diff-algorithm=patience".
> >
> > As I wrote, that is absolutely the intended behaviour.
> >
> > When patience and other algorithm learns how to trade cycles off
> > with output size, --minimal may make a difference, but unlike
> > "--diff-algorithm=minimal" that forces Myers algorithm, the
> > "--minimal" option should not change the underlying algorithm.
>
> OK, so then the problem is just in the doc, where
> --diff-algorithm=minimal
> should rather be documented as something like:
>
> The basic greedy "myers" diff algorithm, spending extra time to make
> sure the smallest possible diff is produced (equivalent to
> `--diff-algorithm=myers --minimal`).
>
> Or is it rather intended to be `--diff-algorithm=default --minimal`,
> whatever the default may be in the future ?
Now that I think about it, do we really want "minimal" as a valid choice
for --diff-algorithm, if it's not a choice of algorithm ?
In that case, we may need a separate config option line diff.algorithm.minimal
or maybe diff.algorithm.tuning ?
>
>
> As for the other flags, --patience and --histogram should probably
> documented as backward-compatibility aliases for --diff-algorithm=,
> right ?
>
>
> I'll send a formal patch if all of this sounds good.
>
>
> And as a last point, there would be the problem shown by patience
> diff
> on the commit referenced in my original post - If patience is still
> considered for promotion to default some day, I guess we wouldn't
> want
> it to make such a bad choice.
>
> Best regards,
> --
> Yann
>
next prev parent reply other threads:[~2020-05-26 17:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <408624876.1034463388.1590484997966.JavaMail.root@zimbra39-e7>
2020-05-26 9:36 ` [BUG] diff algorithm selection issue ydirson
2020-05-26 16:10 ` Junio C Hamano
2020-05-26 16:23 ` Junio C Hamano
2020-05-26 16:56 ` ydirson
2020-05-26 17:21 ` ydirson [this message]
2020-05-26 18:33 ` Junio C Hamano
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=505382066.1036329918.1590513687177.JavaMail.root@zimbra39-e7 \
--to=ydirson@free.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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).