From: Pratyush Yadav <me@yadavpratyush.com>
To: James Yeoman <james.yeoman@appsbroker.com>
Cc: git@vger.kernel.org, Paul Mackerras <paulus@ozlabs.org>
Subject: Re: Fwd: Bug Report
Date: Tue, 31 Mar 2020 12:56:47 +0530 [thread overview]
Message-ID: <20200331072647.vprlkjczj5c7oo7p@yadavpratyush.com> (raw)
In-Reply-To: <CAJ+U58zvMCxuL6a8yfdNHCfsBkivybWxTioPU-p_PtekAAOWuA@mail.gmail.com>
Hi James,
On 30/03/20 09:18AM, James Yeoman wrote:
> Hi, of course
>
> === File at commit 1 ===
> import java.util.List;
>
> public class Foo {
> private int id;
> private String name;
> private List<Programme> programmes;
>
> public Foo() {
>
> }
>
> public Foo(int id, String name, List<Programme> programmes) {
> this.id = id;
> this.name = name;
> this.programmes = programmes;
> }
>
> // getters and setters
> }
>
> === File in working area ===
>
> import java.util.List;
>
> public class Foo {
> private int id;
> private String name;
> private List<Programme> programmes;
>
> public Foo() {
>
> }
>
> public Foo(int id, String name) {
> this.id = id;
> this.name = name;
> }
>
> public Foo(int id, String name, List<Programme> programmes) {
> this(id, name);
> this.programmes = programmes;
> }
>
> // getters and setters
> }
>
> === diff with default ===
> - public Foo(int id, String name, List<Programme> programmes) {
> + public Foo(int id, String name) {
> this.id = id;
> this.name = name;
> + }
> +
> + public Foo(int id, String name, List<Programme> programmes) {
> + this(id, name);
> this.programmes = programmes;
> }
I see this diff with both the default and patience algorithms on the
command line tool.
I ran:
$ git diff --diff-algorithm=default
and
$ git diff --diff-algorithm=patience
Both yield the above diff. In fact, all 4 of "default", "patience",
"minimal", and "histogram" yield the above diff. Which version of Git
are you running? I am on v2.25.2.
PS: Please don't top post on the mailing list.
> === diff with patience ===
> public Foo(int id, String name) {
> + this.id = id;
> + this.name = name;
> + }
> +
> public Foo(int id, String name, List<Programme> programmes) {
> - this.id = id;
> - this.name = name;
> + this(id, name);
> this.programmes = programmes;
> }
>
>
> On Fri, 27 Mar 2020 at 12:59, Pratyush Yadav <me@yadavpratyush.com> wrote:
> >
> > Hi James,
> >
> > On 27/03/20 11:53AM, James Yeoman wrote:
> > > gitk and git-gui are both not respecting git config.
> > >
> > > When I set the diff.algorithm global config to patience, the command
> > > line git respects the config. However, both gitk and git-gui don't.
> > > When I use "git status -vv" to get a diff of the working directory,
> > > the diff produced respects the algorithm choice. The diff of the
> > > working directory in gitk and git-gui both still use the default diff
> > > algorithm, rather than the algorithm from the config.
> >
> > Thanks for reporting. Can you please send steps to produce a simple
> > scenario where the diff from two algorithms is different so I can test
> > why git-gui is not respecting the config. Make them as minimal as
> > possible.
> >
> > Also, +Cc Paul, the gitk maintainer.
> >
> > --
> > Regards,
> > Pratyush Yadav
--
Regards,
Pratyush Yadav
prev parent reply other threads:[~2020-03-31 7:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 11:53 Bug Report James Yeoman
2020-03-27 12:59 ` Pratyush Yadav
[not found] ` <CAJ+U58wHszg6amZivFEh=08N0ZNTcLHVFVyaCv0nQrzi_nx-UA@mail.gmail.com>
2020-03-30 8:18 ` Fwd: " James Yeoman
2020-03-31 7:26 ` Pratyush Yadav [this message]
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=20200331072647.vprlkjczj5c7oo7p@yadavpratyush.com \
--to=me@yadavpratyush.com \
--cc=git@vger.kernel.org \
--cc=james.yeoman@appsbroker.com \
--cc=paulus@ozlabs.org \
/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.