{"thread":{"id":"50833","subject":"Strange behaviour of git log --follow","startedAt":"2019-03-28T12:10:57Z","lastAt":"2019-03-28T13:38:27Z","messageCount":4,"participants":["Victor","Ævar Arnfjörð Bjarmason"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"372612","messageId":"web-54136765@mx30.intranet.ru","threadId":"50833","inReplyTo":null,"subject":"Strange behaviour of git log --follow","fromName":"Victor","fromEmail":"__vic@ngs.ru","sentAt":"2019-03-28T12:10:42Z","receivedAt":"2019-03-28T12:10:57Z","isPatch":false,"sender":{"key":"__vic@ngs.ru","avatar":null},"body":"Hello.\n\n$ git log include/__vic/mutex.h\ncommit 9429293f8f8fb0819c77cf1f723567f6edc8fb6a\nMerge: 96dd9a2 f484f4e\nAuthor: __vic <__vic@ngs.ru>\nDate: 2017-12-13 10:41:32 +0300\n\n     Merge branch 'generic' into posix\n\ncommit f484f4e8aae32041ba56bdce12d1efd8491e94d5\nMerge: 86b848a b9bbbe6\nAuthor: __vic <__vic@ngs.ru>\nDate: 2017-12-12 17:35:10 +0300\n\n     waitable_event, thread, mutex\n$ git log --follow include/__vic/mutex.h\n$\n\nWhy --follow makes git produce truncated history for file \nthat wasn't renamed?\n\nMy repository is available here \nhttps://github.com/2underscores-vic/__vic\n"},{"id":"372613","messageId":"87zhpf9m10.fsf@evledraar.gmail.com","threadId":"50833","inReplyTo":"web-54136765@mx30.intranet.ru","subject":"Re: Strange behaviour of git log --follow","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2019-03-28T13:16:43Z","receivedAt":"2019-03-28T13:16:48Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Mar 28 2019, Victor wrote:\n\n> Hello.\n>\n> $ git log include/__vic/mutex.h\n> commit 9429293f8f8fb0819c77cf1f723567f6edc8fb6a\n> Merge: 96dd9a2 f484f4e\n> Author: __vic <__vic@ngs.ru>\n> Date: 2017-12-13 10:41:32 +0300\n>\n>     Merge branch 'generic' into posix\n>\n> commit f484f4e8aae32041ba56bdce12d1efd8491e94d5\n> Merge: 86b848a b9bbbe6\n> Author: __vic <__vic@ngs.ru>\n> Date: 2017-12-12 17:35:10 +0300\n>\n>     waitable_event, thread, mutex\n> $ git log --follow include/__vic/mutex.h\n> $\n>\n> Why --follow makes git produce truncated history for file that wasn't\n> renamed?\n>\n> My repository is available here\n> https://github.com/2underscores-vic/__vic\n\nI just briefly looked at this. It's because all changes to the relevant\nfile are in merge commits. If you run the \"log\" with \"--stat\" you'll see\nno output.\n\nSomething in the --follow machinery takes the same shortcut on merges\nand doesn't consider them.\n"},{"id":"372619","messageId":"web-54137705@mx30.intranet.ru","threadId":"50833","inReplyTo":"87zhpf9m10.fsf@evledraar.gmail.com","subject":"Re: Strange behaviour of git log --follow","fromName":"Victor","fromEmail":"__vic@ngs.ru","sentAt":"2019-03-28T13:32:07Z","receivedAt":"2019-03-28T13:32:20Z","isPatch":false,"sender":{"key":"__vic@ngs.ru","avatar":null},"body":"Any plans to fix this?\n\nOn Thu, 28 Mar 2019 14:16:43 +0100\n  Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:\n> \n> On Thu, Mar 28 2019, Victor wrote:\n> \n>> Hello.\n>>\n>> $ git log include/__vic/mutex.h\n>> commit 9429293f8f8fb0819c77cf1f723567f6edc8fb6a\n>> Merge: 96dd9a2 f484f4e\n>> Author: __vic <__vic@ngs.ru>\n>> Date: 2017-12-13 10:41:32 +0300\n>>\n>>     Merge branch 'generic' into posix\n>>\n>> commit f484f4e8aae32041ba56bdce12d1efd8491e94d5\n>> Merge: 86b848a b9bbbe6\n>> Author: __vic <__vic@ngs.ru>\n>> Date: 2017-12-12 17:35:10 +0300\n>>\n>>     waitable_event, thread, mutex\n>> $ git log --follow include/__vic/mutex.h\n>> $\n>>\n>> Why --follow makes git produce truncated history for \n>>file that wasn't\n>> renamed?\n>>\n>> My repository is available here\n>> https://github.com/2underscores-vic/__vic\n> \n> I just briefly looked at this. It's because all changes \n>to the relevant\n> file are in merge commits. If you run the \"log\" with \n>\"--stat\" you'll see\n> no output.\n> \n> Something in the --follow machinery takes the same \n>shortcut on merges\n> and doesn't consider them.\n\n"},{"id":"372620","messageId":"87y34z9l0z.fsf@evledraar.gmail.com","threadId":"50833","inReplyTo":"web-54137705@mx30.intranet.ru","subject":"Re: Strange behaviour of git log --follow","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2019-03-28T13:38:20Z","receivedAt":"2019-03-28T13:38:27Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Mar 28 2019, Victor wrote:\n\n> Any plans to fix this?\n\nNo. I just thought I'd peek at it for a sec, sorry. Maybe someone else\nis interested it poking it some more.\n\n> On Thu, 28 Mar 2019 14:16:43 +0100\n>  Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:\n>>\n>> On Thu, Mar 28 2019, Victor wrote:\n>>\n>>> Hello.\n>>>\n>>> $ git log include/__vic/mutex.h\n>>> commit 9429293f8f8fb0819c77cf1f723567f6edc8fb6a\n>>> Merge: 96dd9a2 f484f4e\n>>> Author: __vic <__vic@ngs.ru>\n>>> Date: 2017-12-13 10:41:32 +0300\n>>>\n>>>     Merge branch 'generic' into posix\n>>>\n>>> commit f484f4e8aae32041ba56bdce12d1efd8491e94d5\n>>> Merge: 86b848a b9bbbe6\n>>> Author: __vic <__vic@ngs.ru>\n>>> Date: 2017-12-12 17:35:10 +0300\n>>>\n>>>     waitable_event, thread, mutex\n>>> $ git log --follow include/__vic/mutex.h\n>>> $\n>>>\n>>> Why --follow makes git produce truncated history for file that\n>>> wasn't\n>>> renamed?\n>>>\n>>> My repository is available here\n>>> https://github.com/2underscores-vic/__vic\n>>\n>> I just briefly looked at this. It's because all changes to the\n>> relevant\n>> file are in merge commits. If you run the \"log\" with \"--stat\" you'll\n>> see\n>> no output.\n>>\n>> Something in the --follow machinery takes the same shortcut on\n>> merges\n>> and doesn't consider them.\n"}]}