From: Junio C Hamano <gitster@pobox.com>
To: ydirson@free.fr
Cc: git <git@vger.kernel.org>
Subject: Re: [BUG] diff algorithm selection issue
Date: Tue, 26 May 2020 09:23:02 -0700 [thread overview]
Message-ID: <xmqqd06qoec9.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqqh7w2oexd.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Tue, 26 May 2020 09:10:22 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> the issue, but anyway, somebody seems to be OR'ing in diff_algorithm
> to xdl_opts field after we see --diff-algorithm=minimal and replaced
> XDF_DIFF_ALGORITHM_MASK bits in xdl_opts field in this function, ...
Well, I am not so sure about that diagnosis, actually. I should
probably have taken a bit of caffeine before writing my e-mails.
There is no patch needed. --- I simply had misread your report.
> 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.
Thanks.
next prev parent reply other threads:[~2020-05-26 16:23 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 [this message]
2020-05-26 16:56 ` ydirson
2020-05-26 17:21 ` ydirson
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=xmqqd06qoec9.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=ydirson@free.fr \
/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).