{"thread":{"id":"51986","subject":"log -m output","startedAt":"2019-10-07T16:03:38Z","lastAt":"2019-10-07T17:57:28Z","messageCount":5,"participants":["Semyon Kirnosenko","SZEDER Gábor","Elijah Newren"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"383580","messageId":"ee1f00fd-715c-5ecd-bc29-5e5a2de2d0f9@mail.ru","threadId":"51986","inReplyTo":null,"subject":"log -m output","fromName":"Semyon Kirnosenko","fromEmail":"kirnosenko@mail.ru","sentAt":"2019-10-07T15:14:25Z","receivedAt":"2019-10-07T16:03:38Z","isPatch":false,"sender":{"key":"kirnosenko@mail.ru","avatar":null},"body":"Hi there.\n\nI have a question about log command.\nProbably I'm just missing something but anyway.\nI can illustrate the question on the repository of Git.\nLet's look at revision 1ed91937\nIt is a merge based on pair of revisions a9572072 and 294c695d.\nAccording to blame these parent revisions have different content for\ndelta.h file.\nBut when I get log with -m flag for merge revision, I can't see that\nfile in the list of changed files.\nWhy?\n"},{"id":"383584","messageId":"20191007164310.GA11529@szeder.dev","threadId":"51986","inReplyTo":"ee1f00fd-715c-5ecd-bc29-5e5a2de2d0f9@mail.ru","subject":"Re: log -m output","fromName":"SZEDER Gábor","fromEmail":"szeder.dev@gmail.com","sentAt":"2019-10-07T16:43:10Z","receivedAt":"2019-10-07T16:43:20Z","isPatch":false,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"On Mon, Oct 07, 2019 at 07:14:25PM +0400, Semyon Kirnosenko wrote:\n> I have a question about log command.\n> Probably I'm just missing something but anyway.\n> I can illustrate the question on the repository of Git.\n> Let's look at revision 1ed91937\n> It is a merge based on pair of revisions a9572072 and 294c695d.\n> According to blame these parent revisions have different content for\n> delta.h file.\n\nI'm not sure what you mean by this statement; what blame command did\nyou run?\n\n> But when I get log with -m flag for merge revision, I can't see that\n> file in the list of changed files.\n> Why?\n\nThe contents of 'delta.h' is identical in both parents of that merge:\n\n $ git diff a9572072 294c695d delta.h\n $\n # no difference\n\nSo 'git log -m' does the right thing by not showing 'delta.h'.\n\n"},{"id":"383586","messageId":"7b9c0b0b-2a1c-d4d3-13ba-f020ff15d5ad@mail.ru","threadId":"51986","inReplyTo":"20191007164310.GA11529@szeder.dev","subject":"Re: log -m output","fromName":"Semyon Kirnosenko","fromEmail":"kirnosenko@mail.ru","sentAt":"2019-10-07T17:00:20Z","receivedAt":"2019-10-07T17:00:26Z","isPatch":false,"sender":{"key":"kirnosenko@mail.ru","avatar":null},"body":"On 2019-10-07 20:43, SZEDER Gábor wrote:\n> On Mon, Oct 07, 2019 at 07:14:25PM +0400, Semyon Kirnosenko wrote:\n>> I have a question about log command.\n>> Probably I'm just missing something but anyway.\n>> I can illustrate the question on the repository of Git.\n>> Let's look at revision 1ed91937\n>> It is a merge based on pair of revisions a9572072 and 294c695d.\n>> According to blame these parent revisions have different content for\n>> delta.h file.\n> \n> I'm not sure what you mean by this statement; what blame command did\n> you run?\n> \n>> But when I get log with -m flag for merge revision, I can't see that\n>> file in the list of changed files.\n>> Why?\n> \n> The contents of 'delta.h' is identical in both parents of that merge:\n> \n> $ git diff a9572072 294c695d delta.h\n> $\n> # no difference\n> \n> So 'git log -m' does the right thing by not showing 'delta.h'.\n> \n> .\n> \n\nBut blame shows different results:\n\ngit blame a9572072 delta.h\ngit blame 294c695d delta.h\n\n-- \nС Уважением,\nКирносенко С.И.\n"},{"id":"383591","messageId":"CABPp-BFPrweNZ=ubT+8EE9xPyNjzEuUXKvESmXDb3Mhh37dAVA@mail.gmail.com","threadId":"51986","inReplyTo":"7b9c0b0b-2a1c-d4d3-13ba-f020ff15d5ad@mail.ru","subject":"Re: log -m output","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2019-10-07T17:20:20Z","receivedAt":"2019-10-07T17:20:36Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Mon, Oct 7, 2019 at 10:05 AM Semyon Kirnosenko wrote:\n>\n> On 2019-10-07 20:43, SZEDER Gábor wrote:\n> > On Mon, Oct 07, 2019 at 07:14:25PM +0400, Semyon Kirnosenko wrote:\n> >> I have a question about log command.\n> >> Probably I'm just missing something but anyway.\n> >> I can illustrate the question on the repository of Git.\n> >> Let's look at revision 1ed91937\n> >> It is a merge based on pair of revisions a9572072 and 294c695d.\n> >> According to blame these parent revisions have different content for\n> >> delta.h file.\n> >\n> > I'm not sure what you mean by this statement; what blame command did\n> > you run?\n> >\n> >> But when I get log with -m flag for merge revision, I can't see that\n> >> file in the list of changed files.\n> >> Why?\n> >\n> > The contents of 'delta.h' is identical in both parents of that merge:\n> >\n> > $ git diff a9572072 294c695d delta.h\n> > $\n> > # no difference\n> >\n> > So 'git log -m' does the right thing by not showing 'delta.h'.\n> >\n> > .\n> >\n>\n> But blame shows different results:\n>\n> git blame a9572072 delta.h\n> git blame 294c695d delta.h\n\nblame does not at all claim those two revisions have different\nversions of delta.h:\n\n$ diff -u <(git blame a9572072 delta.h) <(git blame 294c695d delta.h)\n--- /dev/fd/63 2019-10-07 10:16:43.092356078 -0700\n+++ /dev/fd/62 2019-10-07 10:16:43.092356078 -0700\n@@ -9,8 +9,8 @@\n a310d434946 (Nicolas Pitre 2005-05-19 10:27:14 -0400 9)\n void *delta_buf, unsigned long delta_size,\n a310d434946 (Nicolas Pitre 2005-05-19 10:27:14 -0400 10)\n unsigned long *dst_size);\n d1af002dc60 (Nicolas Pitre 2005-05-20 16:59:17 -0400 11)\n-dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 12) /* the\nsmallest possible delta size is 4 bytes */\n-dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 13) #define\nDELTA_SIZE_MIN 4\n+c7a45bd20e4 (Junio C Hamano 2005-12-12 16:42:38 -0800 12) /* the\nsmallest possible delta size is 4 bytes */\n+c7a45bd20e4 (Junio C Hamano 2005-12-12 16:42:38 -0800 13) #define\nDELTA_SIZE_MIN 4\n dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 14)\n dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 15) /*\n dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 16) * This\nmust be called twice on the delta data buffer, first to get t\n\nIt does say that _how_ those two arrived at the *same* version of the\nfile differed, but if you compare the portions of the differing lines\ncorresponding to the actual file contents you see that they are the\nsame...just as SZEDER pointed out.\n"},{"id":"383595","messageId":"300294ff-987e-c868-2917-f8743772bc7c@mail.ru","threadId":"51986","inReplyTo":"CABPp-BFPrweNZ=ubT+8EE9xPyNjzEuUXKvESmXDb3Mhh37dAVA@mail.gmail.com","subject":"Re: log -m output","fromName":"Semyon Kirnosenko","fromEmail":"kirnosenko@mail.ru","sentAt":"2019-10-07T17:57:23Z","receivedAt":"2019-10-07T17:57:28Z","isPatch":false,"sender":{"key":"kirnosenko@mail.ru","avatar":null},"body":"On 2019-10-07 21:20, Elijah Newren wrote:\n> On Mon, Oct 7, 2019 at 10:05 AM Semyon Kirnosenko wrote:\n>>\n>> On 2019-10-07 20:43, SZEDER Gábor wrote:\n>>> On Mon, Oct 07, 2019 at 07:14:25PM +0400, Semyon Kirnosenko wrote:\n>>>> I have a question about log command.\n>>>> Probably I'm just missing something but anyway.\n>>>> I can illustrate the question on the repository of Git.\n>>>> Let's look at revision 1ed91937\n>>>> It is a merge based on pair of revisions a9572072 and 294c695d.\n>>>> According to blame these parent revisions have different content for\n>>>> delta.h file.\n>>>\n>>> I'm not sure what you mean by this statement; what blame command did\n>>> you run?\n>>>\n>>>> But when I get log with -m flag for merge revision, I can't see that\n>>>> file in the list of changed files.\n>>>> Why?\n>>>\n>>> The contents of 'delta.h' is identical in both parents of that merge:\n>>>\n>>> $ git diff a9572072 294c695d delta.h\n>>> $\n>>> # no difference\n>>>\n>>> So 'git log -m' does the right thing by not showing 'delta.h'.\n>>>\n>>> .\n>>>\n>>\n>> But blame shows different results:\n>>\n>> git blame a9572072 delta.h\n>> git blame 294c695d delta.h\n> \n> blame does not at all claim those two revisions have different\n> versions of delta.h:\n> \n> $ diff -u <(git blame a9572072 delta.h) <(git blame 294c695d delta.h)\n> --- /dev/fd/63 2019-10-07 10:16:43.092356078 -0700\n> +++ /dev/fd/62 2019-10-07 10:16:43.092356078 -0700\n> @@ -9,8 +9,8 @@\n> a310d434946 (Nicolas Pitre 2005-05-19 10:27:14 -0400 9)\n> void *delta_buf, unsigned long delta_size,\n> a310d434946 (Nicolas Pitre 2005-05-19 10:27:14 -0400 10)\n> unsigned long *dst_size);\n> d1af002dc60 (Nicolas Pitre 2005-05-20 16:59:17 -0400 11)\n> -dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 12) /* the\n> smallest possible delta size is 4 bytes */\n> -dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 13) #define\n> DELTA_SIZE_MIN 4\n> +c7a45bd20e4 (Junio C Hamano 2005-12-12 16:42:38 -0800 12) /* the\n> smallest possible delta size is 4 bytes */\n> +c7a45bd20e4 (Junio C Hamano 2005-12-12 16:42:38 -0800 13) #define\n> DELTA_SIZE_MIN 4\n> dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 14)\n> dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 15) /*\n> dcde55bc58a (Nicolas Pitre 2005-06-29 02:49:56 -0400 16) * This\n> must be called twice on the delta data buffer, first to get t\n> \n> It does say that _how_ those two arrived at the *same* version of the\n> file differed, but if you compare the portions of the differing lines\n> corresponding to the actual file contents you see that they are the\n> same...just as SZEDER pointed out.\n> \n\nNow I see. I just was confused about changing code ownership without \nchanging code. Thanks!\n"}]}