Fwd: Bug Report

From: James Yeoman <james.yeoman@appsbroker.com>
Date: Mar 30, 2020, 08:18 UTC
Message-ID: <CAJ+U58zvMCxuL6a8yfdNHCfsBkivybWxTioPU-p_PtekAAOWuA@mail.gmail.com>
In-Reply-To: <CAJ+U58wHszg6amZivFEh=08N0ZNTcLHVFVyaCv0nQrzi_nx-UA@mail.gmail.com>

Sorry, my message got rejected because Gmail added html to the message, and when I went to resend my response (making sure it was in plain text mode), I must have clicked the wrong reply button

---------- Forwarded message ---------
From: James Yeoman <james.yeoman@appsbroker.com>
Date: Fri, 27 Mar 2020 at 14:31
Subject: Re: Bug Report
To: Pratyush Yadav <me@yadavpratyush.com>

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;
     }

=== 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:

Show 23 quoted lines

>
> 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