From: Semyon Kirnosenko <kirnosenko@mail.ru>
To: Elijah Newren <newren@gmail.com>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: log -m output
Date: Mon, 7 Oct 2019 21:57:23 +0400 [thread overview]
Message-ID: <300294ff-987e-c868-2917-f8743772bc7c@mail.ru> (raw)
In-Reply-To: <CABPp-BFPrweNZ=ubT+8EE9xPyNjzEuUXKvESmXDb3Mhh37dAVA@mail.gmail.com>
On 2019-10-07 21:20, Elijah Newren wrote:
> On Mon, Oct 7, 2019 at 10:05 AM Semyon Kirnosenko <kirnosenko@mail.ru> wrote:
>>
>> 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
>
> blame does not at all claim those two revisions have different
> versions of delta.h:
>
> $ diff -u <(git blame a9572072 delta.h) <(git blame 294c695d delta.h)
> --- /dev/fd/63 2019-10-07 10:16:43.092356078 -0700
> +++ /dev/fd/62 2019-10-07 10:16:43.092356078 -0700
> @@ -9,8 +9,8 @@
> a310d434946 (Nicolas Pitre 2005-05-19 10:27:14 -0400 9)
> void *delta_buf, unsigned long delta_size,
> a310d434946 (Nicolas Pitre 2005-05-19 10:27:14 -0400 10)
> unsigned long *dst_size);
> d1af002dc60 (Nicolas Pitre 2005-05-20 16:59:17 -0400 11)
> -dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 12) /* the
> smallest possible delta size is 4 bytes */
> -dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 13) #define
> DELTA_SIZE_MIN 4
> +c7a45bd20e4 (Junio C Hamano 2005-12-12 16:42:38 -0800 12) /* the
> smallest possible delta size is 4 bytes */
> +c7a45bd20e4 (Junio C Hamano 2005-12-12 16:42:38 -0800 13) #define
> DELTA_SIZE_MIN 4
> dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 14)
> dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 15) /*
> dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 16) * This
> must be called twice on the delta data buffer, first to get t
>
> It does say that _how_ those two arrived at the *same* version of the
> file differed, but if you compare the portions of the differing lines
> corresponding to the actual file contents you see that they are the
> same...just as SZEDER pointed out.
>
Now I see. I just was confused about changing code ownership without
changing code. Thanks!
prev parent reply other threads:[~2019-10-07 17:57 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
2019-10-07 17:20 ` Elijah Newren
2019-10-07 17:57 ` Semyon Kirnosenko [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=300294ff-987e-c868-2917-f8743772bc7c@mail.ru \
--to=kirnosenko@mail.ru \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--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).