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