* Bug Report @ 2020-03-27 11:53 James Yeoman 2020-03-27 12:59 ` Pratyush Yadav 0 siblings, 1 reply; 4+ messages in thread From: James Yeoman @ 2020-03-27 11:53 UTC (permalink / raw) To: git 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. -- ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Bug Report 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> 0 siblings, 1 reply; 4+ messages in thread From: Pratyush Yadav @ 2020-03-27 12:59 UTC (permalink / raw) To: James Yeoman; +Cc: git, Paul Mackerras 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <CAJ+U58wHszg6amZivFEh=08N0ZNTcLHVFVyaCv0nQrzi_nx-UA@mail.gmail.com>]
* Fwd: Bug Report [not found] ` <CAJ+U58wHszg6amZivFEh=08N0ZNTcLHVFVyaCv0nQrzi_nx-UA@mail.gmail.com> @ 2020-03-30 8:18 ` James Yeoman 2020-03-31 7:26 ` Pratyush Yadav 0 siblings, 1 reply; 4+ messages in thread From: James Yeoman @ 2020-03-30 8:18 UTC (permalink / raw) Cc: git, Paul Mackerras, Pratyush Yadav 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: > > 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 -- ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Fwd: Bug Report 2020-03-30 8:18 ` Fwd: " James Yeoman @ 2020-03-31 7:26 ` Pratyush Yadav 0 siblings, 0 replies; 4+ messages in thread From: Pratyush Yadav @ 2020-03-31 7:26 UTC (permalink / raw) To: James Yeoman; +Cc: git, Paul Mackerras 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-03-31 7:27 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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
Code repositories for project(s) associated with this public inbox https://80x24.org/mirrors/git.git 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 read-only IMAP folder(s) and NNTP newsgroup(s).