All the mail mirrored from lore.kernel.org
 help / color / mirror / Atom feed

From: James Yeoman <james.yeoman@appsbroker.com>
To: unlisted-recipients:; (no To-header on input)
Cc: git@vger.kernel.org, Paul Mackerras <paulus@ozlabs.org>,
	Pratyush Yadav <me@yadavpratyush.com>
Subject: Fwd: Bug Report
Date: Mon, 30 Mar 2020 09:18:18 +0100	[thread overview]
Message-ID: <CAJ+U58zvMCxuL6a8yfdNHCfsBkivybWxTioPU-p_PtekAAOWuA@mail.gmail.com> (raw)
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:
>
> 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

-- 

next prev parent reply	other threads:[~2020-03-30  8:18 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     ` James Yeoman [this message]
2020-03-31  7:26       ` Fwd: " Pratyush Yadav

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=CAJ+U58zvMCxuL6a8yfdNHCfsBkivybWxTioPU-p_PtekAAOWuA@mail.gmail.com \
    --to=james.yeoman@appsbroker.com \
    --cc=git@vger.kernel.org \
    --cc=me@yadavpratyush.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

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.