From: Semyon Kirnosenko <kirnosenko@mail.ru>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: log -m output
Date: Mon, 7 Oct 2019 21:00:20 +0400 [thread overview]
Message-ID: <7b9c0b0b-2a1c-d4d3-13ba-f020ff15d5ad@mail.ru> (raw)
In-Reply-To: <20191007164310.GA11529@szeder.dev>
On 2019-10-07 20:43, SZEDER Gábor wrote:
> On Mon, Oct 07, 2019 at 07:14:25PM +0400, Semyon Kirnosenko wrote:
>> I have a question about log command.
>> Probably I'm just missing something but anyway.
>> I can illustrate the question on the repository of Git.
>> Let's look at revision 1ed91937
>> It is a merge based on pair of revisions a9572072 and 294c695d.
>> According to blame these parent revisions have different content for
>> delta.h file.
>
> I'm not sure what you mean by this statement; what blame command did
> you run?
>
>> But when I get log with -m flag for merge revision, I can't see that
>> file in the list of changed files.
>> Why?
>
> The contents of 'delta.h' is identical in both parents of that merge:
>
> $ git diff a9572072 294c695d delta.h
> $
> # no difference
>
> So 'git log -m' does the right thing by not showing 'delta.h'.
>
> .
>
But blame shows different results:
git blame a9572072 delta.h
git blame 294c695d delta.h
--
С Уважением,
Кирносенко С.И.
next prev parent reply other threads:[~2019-10-07 17:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-07 15:14 log -m output Semyon Kirnosenko
2019-10-07 16:43 ` SZEDER Gábor
2019-10-07 17:00 ` Semyon Kirnosenko [this message]
2019-10-07 17:20 ` Elijah Newren
2019-10-07 17:57 ` Semyon Kirnosenko
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=7b9c0b0b-2a1c-d4d3-13ba-f020ff15d5ad@mail.ru \
--to=kirnosenko@mail.ru \
--cc=git@vger.kernel.org \
--cc=szeder.dev@gmail.com \
/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).