From: Viresh Kumar <viresh.kumar@linaro.org>
To: Elijah Newren <newren@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>,
Johannes Sixt <j6t@kdbg.org>,
vincent.guittot@linaro.org
Subject: Re: [Bug report] git diff stat shows unrelated diff
Date: Mon, 18 Feb 2019 10:04:53 +0530 [thread overview]
Message-ID: <20190218043453.b3jkt365bvg2deox@vireshk-i7> (raw)
In-Reply-To: <CABPp-BFpj8DBxgsqe9Rqnzb4vx5fPqNc+sUj8LzrFMj2bacoBQ@mail.gmail.com>
On 15-02-19, 08:09, Elijah Newren wrote:
> Hi Viresh,
>
> On Thu, Feb 14, 2019 at 10:40 PM Viresh Kumar <viresh.kumar@linaro.org> wrote:
> >
> > On 14-02-19, 13:23, Elijah Newren wrote:
> > > I think you're getting tripped up by double-dot vs triple-dot with
> > > diff being different than log:
> > >
> > > `git diff D..E` means the same thing as `git diff D E`, i.e. diff the
> > > two commits D and E.
> >
> > Right, so both the branches have at least until rc2 (though
> > pm/linux-next had until rc6), why will the diff D..E show the diff
> > between rc1 and rc2 ?
>
> I don't think it does; it includes the diff between rc2 and rc6.
> First, `git diff D..E` will show you roughly the same thing as if you
> have two clones of linux, one with D checked out, one with E checked
> out, and then you run 'diff -ru linux-copy1/ linux-copy2/'.
>
> But let's go back to your example, you had
>
> Branch A: commit 55538fbc79e9
> Branch B: commit a4f342b9607d
> Branch C: commit 7c139d3f0f99
> Branch pm/linux-next: unspecified, but I'll guess commit a06639e89e4
I mentioned that at the bottom of the email, d26ff2405272 :)
And yes I got confused somehow earlier, ran all the commands again to
verify the diffs, sorry about that.
--
viresh
prev parent reply other threads:[~2019-02-18 4:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 8:22 [Bug report] git diff stat shows unrelated diff Viresh Kumar
2019-02-14 18:42 ` Johannes Sixt
2019-02-14 21:23 ` Elijah Newren
2019-02-14 22:10 ` Junio C Hamano
2019-02-15 18:52 ` Denton Liu
2019-02-15 19:25 ` Elijah Newren
2019-02-15 20:12 ` Junio C Hamano
2019-02-15 22:48 ` Philip Oakley
2019-02-15 23:32 ` Junio C Hamano
2019-02-16 12:47 ` Philip Oakley
2019-02-17 3:34 ` Junio C Hamano
2019-02-17 23:34 ` Philip Oakley
2019-02-18 0:21 ` Junio C Hamano
2019-02-15 19:28 ` Junio C Hamano
2019-02-15 6:40 ` Viresh Kumar
2019-02-15 16:09 ` Elijah Newren
2019-02-18 4:34 ` Viresh Kumar [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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190218043453.b3jkt365bvg2deox@vireshk-i7 \
--to=viresh.kumar@linaro.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=newren@gmail.com \
--cc=vincent.guittot@linaro.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.
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).